Moved service in testlib back onto instance and off of class; left opts on class.

Author: Frederick Ross

tests/test_app.py

@@ -41,9 +41,11 @@ def setUp(self):
 
     @classmethod
     def tearDownClass(cls):
-        for app in cls.service.apps:
+        import splunklib.client as client
+        service = client.connect(**cls.opts.kwargs)
+        for app in service.apps:
             if app.name.startswith('delete-me'):
-                cls.service.apps.delete(app.name)
+                service.apps.delete(app.name)
 
     def test_app_integrity(self):
         self.check_entity(self.app)

tests/testlib.py

@@ -164,13 +164,10 @@ def f(_):
     @classmethod
     def setUpClass(cls):
         cls.opts = parse([], {}, ".splunkrc")
-        import splunklib.client as client
-        cls.service = client.connect(**cls.opts.kwargs)
 
     def setUp(self):
         unittest.TestCase.setUp(self)
         import splunklib.client as client
-        self.opts = parse([], {}, ".splunkrc")
         self.service = client.connect(**self.opts.kwargs)
         self.splunk_version = int(self.service.info['version'].split('.')[0])
         logging.debug("Connected to splunkd version %s", '.'.join(str(x) for x in self.service.splunk_version))