test case refactoring for code change

Author: ashah-splunk

splunklib/binding.py

@@ -518,23 +518,23 @@ def _auth_headers(self):
 
         :returns: A list of 2-tuples containing key and value
         """
-        if self.token is not _NoAuthenticationToken:
-            if self.token.startswith('Splunk '):
-                token = self.token
-            else:
-                token = 'Splunk %s' % self.token
+        if self.has_cookies():
+            return [("Cookie", _make_cookie_header(list(self.get_cookies().items())))]
+        elif self.basic and (self.username and self.password):
+            token = 'Basic %s' % b64encode(("%s:%s" % (self.username, self.password)).encode('utf-8')).decode('ascii')
             return [("Authorization", token)]
         elif self.bearerToken:
             token = 'Bearer %s' % self.bearerToken
             return [("Authorization", token)]
-        elif self.basic and (self.username and self.password):
-            token = 'Basic %s' % b64encode(("%s:%s" % (self.username, self.password)).encode('utf-8')).decode('ascii')
-            return [("Authorization", token)]
-        elif self.has_cookies():
-            return [("Cookie", _make_cookie_header(list(self.get_cookies().items())))]
-        else:
-            # no Authentication token
+        elif self.token is _NoAuthenticationToken:
             return []
+        else:
+            # Ensure the token is properly formatted
+            if self.token.startswith('Splunk '):
+                token = self.token
+            else:
+                token = 'Splunk %s' % self.token
+            return [("Authorization", token)]
 
     def connect(self):
         """Returns an open connection (socket) to the Splunk instance.

tests/test_binding.py

@@ -586,23 +586,22 @@ def test_got_updated_cookie_with_get(self):
         self.assertTrue(found)
 
     def test_login_fails_with_bad_cookie(self):
-        new_context = binding.connect(**{"cookie": "bad=cookie"})
         # We should get an error if using a bad cookie
         try:
-            new_context.get("apps/local")
+            new_context = binding.connect(**{"cookie": "bad=cookie"})
             self.fail()
         except AuthenticationError as ae:
-            self.assertEqual(str(ae), "Request failed: Session is not logged in.")
+            self.assertEqual(str(ae), "Login failed.")
 
     def test_login_with_multiple_cookies(self):
-        bad_cookie = 'bad=cookie'
-        new_context = binding.connect(**{"cookie": bad_cookie})
         # We should get an error if using a bad cookie
+        new_context = binding.Context()
+        new_context.get_cookies().update({"bad": "cookie"})
         try:
-            new_context.get("apps/local")
+            new_context = new_context.login()
             self.fail()
         except AuthenticationError as ae:
-            self.assertEqual(str(ae), "Request failed: Session is not logged in.")
+            self.assertEqual(str(ae), "Login failed.")
             # Bring in a valid cookie now
             for key, value in self.context.get_cookies().items():
                 new_context.get_cookies()[key] = value

tests/test_service.py

@@ -214,15 +214,14 @@ def test_login_fails_with_bad_cookie(self):
         service2 = client.Service()
         self.assertEqual(len(service2.get_cookies()), 0)
         service2.get_cookies().update(bad_cookie)
-        service2.login()
         self.assertEqual(service2.get_cookies(), {'bad': 'cookie'})
 
         # Should get an error with a bad cookie
         try:
-            service2.apps.get()
+            service2.login()
             self.fail()
         except AuthenticationError as ae:
-            self.assertEqual(str(ae), "Request failed: Session is not logged in.")
+            self.assertEqual(str(ae), "Login failed.")
 
     def test_autologin_with_cookie(self):
         self.service.login()
@@ -264,14 +263,13 @@ def test_login_with_multiple_cookies(self):
         self.assertIsNotNone(self.service.get_cookies())
 
         service2 = client.Service(**{"cookie": bad_cookie})
-        service2.login()
 
         # Should get an error with a bad cookie
         try:
-            service2.apps.get()
+            service2.login()
             self.fail()
         except AuthenticationError as ae:
-            self.assertEqual(str(ae), "Request failed: Session is not logged in.")
+            self.assertEqual(str(ae), "Login failed.")
 
             # Add on valid cookies, and try to use all of them
             service2.get_cookies().update(self.service.get_cookies())