Made skipping without sdk-app-collection actually work. (Didn't before…)

Author: Frederick Ross

tests/test_index.py

@@ -111,8 +111,10 @@ def test_submit_via_attached_socket(self):
             sock.send('Hello world!\r\n')
         self.assertEventuallyTrue(lambda: self.totalEventCount() == eventCount+1, timeout=60)
 
-    @unittest.skipUnless(testlib.has_app_collection, "Test requires sdk-app-collection.")
     def test_upload(self):
+        if not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
         self.install_app_from_collection("file_to_upload")
 
         eventCount = int(self.index['totalEventCount'])

tests/test_input.py

@@ -147,8 +147,10 @@ def test_inputs_list_on_one_kind_with_search(self):
         found = [x.name for x in self.service.inputs.list('monitor', search=search)]
         self.assertEqual(expected, found)
 
-    @unittest.skipUnless(testlib.has_app_collection, "Test requires sdk-app-collection.")
     def test_oneshot(self):
+        if not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
         self.install_app_from_collection('file_to_upload')
 
         index_name = testlib.tmpname()
@@ -205,10 +207,13 @@ def test_list(self):
         for input in input_list:
             self.assertTrue(input.name is not None)
 
-    @unittest.skipUnless(testlib.has_app_collection, "Test requires sdk-app-collection.")
     def test_lists_modular_inputs(self):
         if self.service.splunk_version[0] < 5:
-            return # Modular inputs don't exist prior to 5.0
+            print "Modular inputs don't exist prior to Splunk 5.0. Skipping."
+            return
+        elif not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
         else:
             # Install modular inputs to list, and restart
             # so they'll show up.

tests/test_job.py

@@ -114,33 +114,48 @@ def test_read_jobs(self):
             job.refresh()
             self.check_job(job)
 
-@unittest.skipUnless(testlib.has_app_collection, "Test requires sdk-app-collection.")
 class TestJobWithDelayedDone(testlib.SDKTestCase):
     def setUp(self):
         super(TestJobWithDelayedDone, self).setUp()
+        self.job = None
+
+    def tearDown(self):
+        super(TestJobWithDelayedDone, self).tearDown()
+        if self.job is not None:
+            self.job.cancel()
+            self.assertEventuallyTrue(lambda: self.job.sid not in self.service.jobs)
+
+    def test_enable_preview(self):
+        if not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
         self.install_app_from_collection("sleep_command")
-        self.query = "search index=_internal | sleep done=100"
+        self.query = "search index=_internal | sleep 100"
         self.job = self.service.jobs.create(
             query=self.query,
             earliest_time="-1m",
             priority=5,
             latest_time="now")
-
-    def tearDown(self):
-        super(TestJobWithDelayedDone, self).tearDown()
-        self.job.cancel()
-        self.assertEventuallyTrue(lambda: self.job.sid not in self.service.jobs)
-
-    def test_enable_preview(self):
         self.assertEqual(self.job['isPreviewEnabled'], '0')
         self.job.enable_preview()
         def is_preview():
+            self.job.refresh()
             if self.job.is_done():
                 self.fail('Job finished before preview enabled.')
             return self.job['isPreviewEnabled'] == '1'
         self.assertEventuallyTrue(is_preview)
 
     def test_setpriority(self):
+        if not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
+        self.install_app_from_collection("sleep_command")
+        self.query = "search index=_internal | sleep 100"
+        self.job = self.service.jobs.create(
+            query=self.query,
+            earliest_time="-1m",
+            priority=5,
+            latest_time="now")
         # Note that you can only *decrease* the priority (i.e., 5 decreased to 3)
         # of a job unless Splunk is running as root. This is because Splunk jobs
         # are tied up with operating system processes and their priorities.
@@ -232,7 +247,7 @@ def test_touch(self):
         # This cannot be tested very fast. touch will reset the ttl to the original value for the job,
         # so first we have to wait just long enough for the ttl to tick down. Its granularity is 1s,
         # so we'll wait 1.1s before we start.
-        import time; time.sleep(1.1)
+        import time; time.sleep(2)
         old_ttl = int(self.job['ttl'])
         self.job.touch()
         self.job.refresh()

tests/test_modular_input_kinds.py

@@ -21,14 +21,17 @@
     import unittest2 as unittest
 import splunklib.client as client
 
-@unittest.skipUnless(testlib.has_app_collection, "Test requires sdk-app-collection.")
 class ModularInputKindTestCase(testlib.SDKTestCase):
     def setUp(self):
         super(ModularInputKindTestCase, self).setUp()
-        self.install_app_from_collection("modular-inputs")
         self.uncheckedRestartSplunk()
 
     def test_list_arguments(self):
+        if not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
+        self.install_app_from_collection("modular-inputs")
+
         if self.service.splunk_version[0] < 5:
             # Not implemented before 5.0
             return
@@ -43,6 +46,11 @@ def test_list_arguments(self):
         self.assertEqual(expected_args, found_args)
 
     def test_update_raises_exception(self):
+        if not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
+        self.install_app_from_collection("modular-inputs")
+
         if self.service.splunk_version[0] < 5:
             # Not implemented before 5.0
             return
@@ -59,6 +67,11 @@ def check_modular_input_kind(self, m):
             self.assertEqual('simple', m['streaming_mode'])
 
     def test_list_modular_inputs(self):
+        if not self.app_collection_installed():
+            print "Test requires sdk-app-collection. Skipping."
+            return
+        self.install_app_from_collection("modular-inputs")
+
         if self.service.splunk_version[0] < 5:
             # Not implemented before 5.0
             return

tests/testlib.py

@@ -51,8 +51,6 @@ class NoRestartRequiredError(Exception):
 class WaitTimedOutError(Exception):
     pass
 
-has_app_collection = False
-
 def to_bool(x):
     if x == '1':
         return True
@@ -233,9 +231,6 @@ def setUpClass(cls):
         if service.restart_required:
             service.restart(timeout=120)
 
-        global has_app_collection
-        has_app_collection = 'sdk-app-collection' in service.apps
-
     def setUp(self):
         unittest.TestCase.setUp(self)
         self.service = client.connect(**self.opts.kwargs)