Fixed final test failures :)

We've adapted to the fact that unittest2.TestCase does not implement assertIsNotNone. We've left it to another day to resolve this issue: unittest2.TestCase does not implement skipTest. We've left a to-do in code. A bug is forthcoming.

This fix is verified on all three platforms, Python 2.6/2.7, and Splunk 6.2/6.3.

Next up: Push to develop and publish to github.

Author: David Noble

tests/test_binding.py

@@ -496,6 +496,7 @@ def test_logout(self):
         response = self.context.get("/services")
         self.assertEqual(response.status, 200)
 
+
 class TestCookieAuthentication(unittest.TestCase):
     def setUp(self):
         self.opts = testlib.parse([], {}, ".splunkrc")
@@ -504,10 +505,17 @@ def setUp(self):
         # Skip these tests if running below Splunk 6.2, cookie-auth didn't exist before
         import splunklib.client as client
         service = client.Service(**self.opts.kwargs)
+        # TODO: Workaround the fact that skipTest is not defined by unittest2.TestCase
         splver = service.splunk_version
         if splver[:2] < (6, 2):
             self.skipTest("Skipping cookie-auth tests, running in %d.%d.%d, this feature was added in 6.2+" % splver)
 
+    if getattr(unittest.TestCase, 'assertIsNotNone', None) is None:
+
+        def assertIsNotNone(self, obj, msg=None):
+            if obj is None:
+                raise self.failureException, (msg or '%r is not None' % obj)
+
     def test_cookie_in_auth_headers(self):
         self.assertIsNotNone(self.context._auth_headers)
         self.assertNotEqual(self.context._auth_headers, [])

tests/test_service.py

@@ -171,16 +171,24 @@ def _create_unauthenticated_service(self):
             'scheme': self.opts.kwargs['scheme']
         })
 
+
 class TestCookieAuthentication(unittest.TestCase):
     def setUp(self):
         self.opts = testlib.parse([], {}, ".splunkrc")
         self.service = client.Service(**self.opts.kwargs)
 
         # Skip these tests if running below Splunk 6.2, cookie-auth didn't exist before
         splver = self.service.splunk_version
+        # TODO: Workaround the fact that skipTest is not defined by unittest2.TestCase
         if splver[:2] < (6, 2):
             self.skipTest("Skipping cookie-auth tests, running in %d.%d.%d, this feature was added in 6.2+" % splver)
 
+    if getattr(unittest.TestCase, 'assertIsNotNone', None) is None:
+
+        def assertIsNotNone(self, obj, msg=None):
+            if obj is None:
+                raise self.failureException, (msg or '%r is not None' % obj)
+
     def test_login_and_store_cookie(self):
         self.assertIsNotNone(self.service.get_cookies())
         self.assertEquals(len(self.service.get_cookies()), 0)
@@ -263,7 +271,7 @@ def test_login_with_multiple_cookies(self):
             service2.apps.get()
             self.fail()
         except AuthenticationError as ae:
-            self.assertEqual(ae.message, "Request failed: Session is not logged in.")
+            self.assertEqual(str(ae), "Request failed: Session is not logged in.")
 
             # Add on valid cookies, and try to use all of them
             service2.get_cookies().update(self.service.get_cookies())