Only check for is_preview in job result if ran on Splunk pre-v10

Author: Ickerday

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Publish release
+name: Publish release to PyPI
 on:
   release:
     types: [published]

.github/workflows/test.yml

@@ -1,11 +1,12 @@
-name: Run test suite
+name: Python CI
 
 on: [push, workflow_dispatch]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-22.04
@@ -18,8 +19,6 @@ jobs:
           - "9.3"
           # - "9.4"
           # - "latest"
-
-      fail-fast: false
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

pyproject.toml

@@ -41,14 +41,7 @@ build-backend = "setuptools.build_meta"
 version = { attr = "splunklib.__version__" }
 
 # https://docs.astral.sh/ruff/configuration/
-[tool.ruff]
-line-length = 120
-indent-width = 4
-
-[tool.ruff.format]
-quote-style = "double"
-indent-style = "space"
-line-ending = "auto"
+# [tool.ruff]
 
 [tool.ruff.lint]
 pydocstyle.convention = "google"

tests/searchcommands/test_csc_apps.py

@@ -15,10 +15,11 @@
 # under the License.
 
 import unittest
+
 import pytest
 
-from tests import testlib
 from splunklib import results
+from tests import testlib
 
 
 @pytest.mark.smoke
@@ -71,7 +72,9 @@ def test_eventing_app(self):
         result = results.JSONResultsReader(stream)
         ds = list(result)
 
-        self.assertEqual(result.is_preview, False)
+        if self.service.splunk_version < (10,):
+            self.assertEqual(result.is_preview, False)
+
         self.assertTrue(isinstance(ds[0], (dict, results.Message)))
         nonmessages = [d for d in ds if isinstance(d, dict)]
         self.assertTrue(len(nonmessages) <= 10)

tests/test_job.py

@@ -56,7 +56,10 @@ def test_oneshot(self):
         )
         result = results.JSONResultsReader(stream)
         ds = list(result)
-        self.assertEqual(result.is_preview, False)
+
+        if self.service.splunk_version < (10,):
+            self.assertEqual(result.is_preview, False)
+
         self.assertTrue(isinstance(ds[0], dict) or isinstance(ds[0], results.Message))
         nonmessages = [d for d in ds if isinstance(d, dict)]
         self.assertTrue(len(nonmessages) <= 3)
@@ -72,7 +75,10 @@ def test_export(self):
         )
         result = results.JSONResultsReader(stream)
         ds = list(result)
-        self.assertEqual(result.is_preview, False)
+
+        if self.service.splunk_version < (10,):
+            self.assertEqual(result.is_preview, False)
+
         self.assertTrue(isinstance(ds[0], dict) or isinstance(ds[0], results.Message))
         nonmessages = [d for d in ds if isinstance(d, dict)]
         self.assertTrue(len(nonmessages) <= 3)
@@ -92,7 +98,9 @@ def test_export_docstring_sample(self):
             elif isinstance(result, dict):
                 # Normal events are returned as dicts
                 pass  # print(result)
-        assert rr.is_preview == False
+
+        if self.service.splunk_version < (10,):
+            self.assertFalse(rr.is_preview)
 
     def test_results_docstring_sample(self):
         from splunklib import results
@@ -109,7 +117,9 @@ def test_results_docstring_sample(self):
             elif isinstance(result, dict):
                 # Normal events are returned as dicts
                 pass  # print(result)
-        assert rr.is_preview == False
+
+        if self.service.splunk_version < (10,):
+            self.assertFalse(rr.is_preview)
 
     def test_preview_docstring_sample(self):
         from splunklib import client
@@ -125,13 +135,14 @@ def test_preview_docstring_sample(self):
             elif isinstance(result, dict):
                 # Normal events are returned as dicts
                 pass  # print(result)
-        if rr.is_preview:
-            pass  # print("Preview of a running search job.")
-        else:
-            pass  # print("Job is finished. Results are final.")
+
+        if self.service.splunk_version < (10,):
+            if rr.is_preview:
+                pass  # print("Preview of a running search job.")
+            else:
+                pass  # print("Job is finished. Results are final.")
 
     def test_oneshot_docstring_sample(self):
-        from splunklib import client
         from splunklib import results
 
         service = self.service  # cheat
@@ -145,7 +156,9 @@ def test_oneshot_docstring_sample(self):
             elif isinstance(result, dict):
                 # Normal events are returned as dicts
                 pass  # print(result)
-        assert rr.is_preview == False
+
+        if self.service.splunk_version < (10,):
+            self.assertFalse(rr.is_preview)
 
     def test_normal_job_with_garbage_fails(self):
         jobs = self.service.jobs