[DVPL-10898] Cosmetic changes and revert some values

Author: Philippe Tang

splunklib/client.py

@@ -820,7 +820,7 @@ def get(self, path_segment="", owner=None, app=None, sharing=None, **query):
         # Search API v2+ fallback to v1:
         #   - In v2+, /results_preview, /events and /results do not support search params.
         #   - Fallback from v2+ to v1 if Splunk Version is < 9.
-        if api_version >= 2  and ('search' in query and path.endswith(tuple(["results_preview", "events", "results"])) or self.service.splunk_version < (9,)):
+        if api_version >= 2 and ('search' in query and path.endswith(tuple(["results_preview", "events", "results"])) or self.service.splunk_version < (9,)):
             path = path.replace(PATH_JOBS_V2, PATH_JOBS)
         return self.service.get(path,
                                 owner=owner, app=app, sharing=sharing,
@@ -888,7 +888,7 @@ def post(self, path_segment="", owner=None, app=None, sharing=None, **query):
         # Search API v2+ fallback to v1:
         #   - In v2+, /results_preview, /events and /results do not support search params.
         #   - Fallback from v2+ to v1 if Splunk Version is < 9.
-        if api_version >= 2  and ('search' in query and path.endswith(tuple(["results_preview", "events", "results"])) or self.service.splunk_version < (9,)):
+        if api_version >= 2 and ('search' in query and path.endswith(tuple(["results_preview", "events", "results"])) or self.service.splunk_version < (9,)):
             path = path.replace(PATH_JOBS_V2, PATH_JOBS)
         return self.service.post(path, owner=owner, app=app, sharing=sharing, **query)
 

tests/testlib.py

@@ -165,9 +165,9 @@ def fake_splunk_version(self, version):
 
 
     def install_app_from_collection(self, name):
-        collectionName = 'sdk-app-collection'
+        collectionName = 'sdkappcollection'
         if collectionName not in self.service.apps:
-            raise ValueError("sdk-app-collection not installed in splunkd")
+            raise ValueError("sdkappcollection not installed in splunkd")
         appPath = self.pathInApp(collectionName, ["build", name+".tar"])
         kwargs = {"update": True, "name": appPath, "filename": True}
 
@@ -181,7 +181,7 @@ def install_app_from_collection(self, name):
         self.installedApps.append(name)
 
     def app_collection_installed(self):
-        collectionName = 'sdk-app-collection'
+        collectionName = 'sdkappcollection'
         return collectionName in self.service.apps
 
     def pathInApp(self, appName, pathComponents):