CORD-1939 support for nose2
modify test cases to be compliant with automation
Change-Id: Iddb3803b71d027010e4df00efd2ed8ba671efbd7
diff --git a/lib/xos-config/tests/config_test.py b/lib/xos-config/tests/test_config.py
similarity index 92%
rename from lib/xos-config/tests/config_test.py
rename to lib/xos-config/tests/test_config.py
index a3a89de..714936c 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()
@@ -143,10 +147,24 @@
Config.init(basic_conf)
log = Config.get("logging")
self.assertEqual(log, {
- "level": "info",
- "channels": ["file", "console"],
- "logstash_hostport": "cordloghost:5617",
- "file": "/var/log/xos.log",
+ 'version': 1,
+ 'handlers': {
+ 'console': {
+ 'class': 'logging.StreamHandler',
+ },
+ 'file': {
+ 'class': 'logging.handlers.RotatingFileHandler',
+ 'filename': '/var/log/xos.log',
+ 'maxBytes': 10485760,
+ 'backupCount': 5
+ }
+ },
+ 'loggers': {
+ '': {
+ 'handlers': ['console', 'file'],
+ 'level': 'DEBUG'
+ }
+ }
})
def test_get_config_file(self):
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