Update conditional logic

Author: Shakeel Mohamed

splunklib/client.py

@@ -1938,8 +1938,8 @@ def attach(self, host=None, source=None, sourcetype=None):
         path = UrlEncoded(PATH_RECEIVERS_STREAM + "?" + urllib.urlencode(args), skip_encode=True)
 
         cookie_or_auth_header = "Authorization: Splunk %s\r\n" % \
-            self.service.token if isinstance(self.service.token, _NoAuthenticationToken) \
-            else self.service.token.replace("Splunk ", "")
+                                (self.service.token if self.service.token is _NoAuthenticationToken
+                                 else self.service.token.replace("Splunk ", ""))
 
         # If we have cookie(s), use them instead of "Authorization: ..."
         if self.service.has_cookies():

tests/test_index.py

@@ -103,12 +103,13 @@ def test_submit_via_attach(self):
 
     def test_submit_via_attach_using_token_header(self):
         # Remove the prefix from the token
-        token = self.service.token.replace("Splunk: ", "")
-        s = client.Service(**{token: token})
+        s = client.connect(**{'token': self.service.token.replace("Splunk ", "")})
         i = s.indexes[self.index_name]
         event_count = int(i['totalEventCount'])
+        if s.has_cookies():
+            del s.http._cookies
         cn = i.attach()
-        cn.send("Hello Boris!\r\n")
+        cn.send("Hello Boris 5!\r\n")
         cn.close()
         self.assertEventuallyTrue(lambda: self.totalEventCount() == event_count+1, timeout=60)