Test suite skips all tests requiring app collection if it's not installed.

Author: Frederick Ross

tests/test_index.py

@@ -17,6 +17,10 @@
 from os import path
 import time
 import testlib
+try:
+    import unittest
+except ImportError:
+    import unittest2 as unittest
 
 import splunklib.client as client
 
@@ -107,6 +111,7 @@ 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):
         self.install_app_from_collection("file_to_upload")
 

tests/test_input.py

@@ -17,6 +17,10 @@
 
 import testlib
 import logging
+try:
+    import unittest
+except ImportError:
+    import unittest2 as unittest
 
 import splunklib.client as client
 
@@ -143,6 +147,7 @@ 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):
         self.install_app_from_collection('file_to_upload')
 
@@ -200,6 +205,7 @@ 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

tests/test_job.py

@@ -114,6 +114,7 @@ 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()

tests/test_modular_input_kinds.py

@@ -15,8 +15,13 @@
 # under the License.
 
 import testlib
+try:
+    import unittest
+except ImportError:
+    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()

tests/testlib.py

@@ -51,6 +51,8 @@ class NoRestartRequiredError(Exception):
 class WaitTimedOutError(Exception):
     pass
 
+has_app_collection = False
+
 def to_bool(x):
     if x == '1':
         return True
@@ -172,6 +174,10 @@ def install_app_from_collection(self, name):
                 raise IOError("App %s not found in app collection" % name)
         self.installedApps.append(name)
 
+    def app_collection_installed(self):
+        collectionName = 'sdk-app-collection'
+        return collectionName in self.service.apps
+
     def pathInApp(self, appName, pathComponents):
         """Return a path to *pathComponents* in *appName*.
 
@@ -227,6 +233,9 @@ 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)