|
@@ -146,9 +146,7 @@ class TestBasicMethods(unittest.TestCase):
|
|
|
timer_name), 0)
|
|
|
|
|
|
class BaseTestCounter():
|
|
|
- @classmethod
|
|
|
- def setUpClass(cls):
|
|
|
- imp.reload(counter)
|
|
|
+
|
|
|
def setUp(self):
|
|
|
self._module_spec = isc.config.module_spec_from_file(
|
|
|
self.TEST_SPECFILE_LOCATION)
|
|
@@ -326,9 +324,6 @@ class BaseTestCounter():
|
|
|
|
|
|
class TestCounter1(unittest.TestCase, BaseTestCounter):
|
|
|
TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec1.spec'
|
|
|
- @classmethod
|
|
|
- def setUpClass(cls):
|
|
|
- BaseTestCounter.setUpClass()
|
|
|
def setUp(self):
|
|
|
BaseTestCounter.setUp(self)
|
|
|
def tearDown(self):
|
|
@@ -336,9 +331,6 @@ class TestCounter1(unittest.TestCase, BaseTestCounter):
|
|
|
|
|
|
class TestCounter2(unittest.TestCase, BaseTestCounter):
|
|
|
TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec2.spec'
|
|
|
- @classmethod
|
|
|
- def setUpClass(cls):
|
|
|
- BaseTestCounter.setUpClass()
|
|
|
def setUp(self):
|
|
|
BaseTestCounter.setUp(self)
|
|
|
def tearDown(self):
|
|
@@ -346,9 +338,6 @@ class TestCounter2(unittest.TestCase, BaseTestCounter):
|
|
|
|
|
|
class TestCounter3(unittest.TestCase, BaseTestCounter):
|
|
|
TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec3.spec'
|
|
|
- @classmethod
|
|
|
- def setUpClass(cls):
|
|
|
- BaseTestCounter.setUpClass()
|
|
|
def setUp(self):
|
|
|
BaseTestCounter.setUp(self)
|
|
|
def tearDown(self):
|