CORD-1939: support for nose2
modify test cases to be compliant with automation
Cherry-pick from cord-4.1 b641f9060eb912470a284bfd04dd955b031af708
Change-Id: I01914ccfb57979994534c6128bc5ff72ae10f64b
diff --git a/lib/xos-config/tests/config_test.py b/lib/xos-config/tests/test_config.py
similarity index 98%
rename from lib/xos-config/tests/config_test.py
rename to lib/xos-config/tests/test_config.py
index 1ce1ce6..bc9ad13 100644
--- a/lib/xos-config/tests/config_test.py
+++ b/lib/xos-config/tests/test_config.py
@@ -52,6 +52,10 @@
Testing the XOS Config Module
"""
+ def setUp(self):
+ # In case some other testcase in nose has left config in an unclean state
+ Config.clear()
+
def tearDown(self):
# NOTE clear the config after each test
Config.clear()
@@ -239,4 +243,4 @@
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()
diff --git a/lib/xos-config/xosconfig/__init__.py b/lib/xos-config/xosconfig/__init__.py
index b7ad3d8..105d4a0 100644
--- a/lib/xos-config/xosconfig/__init__.py
+++ b/lib/xos-config/xosconfig/__init__.py
@@ -14,4 +14,4 @@
# limitations under the License.
-from .config import Config
\ No newline at end of file
+from .config import Config