Adds parser tests and cleanup

[apex.git] / apex / tests / test_apex_common_utils.py

diff --git a/apex/tests/test_apex_common_utils.py b/apex/tests/test_apex_common_utils.py
index 357ad1b..12aeaf2 100644 (file)
--- a/apex/tests/test_apex_common_utils.py
+++ b/apex/tests/test_apex_common_utils.py
@@ -8,7 +8,6 @@
 ##############################################################################
 
 import ipaddress
-import nose.tools
 import os
 
 from apex.common import utils
@@ -17,43 +16,47 @@ from apex.tests.constants import (
     TEST_CONFIG_DIR,
     TEST_PLAYBOOK_DIR)
 
+from nose.tools import (
+    assert_equal,
+    assert_is_instance,
+    assert_not_is_instance)
+
 NET_SETS = os.path.join(TEST_CONFIG_DIR, 'network', 'network_settings.yaml')
 
 
-class TestCommonUtils(object):
+class TestCommonUtils:
     @classmethod
-    def setup_class(klass):
+    def setup_class(cls):
         """This method is run once for each class before any tests are run"""
 
     @classmethod
-    def teardown_class(klass):
+    def teardown_class(cls):
         """This method is run once for each class _after_ all tests are run"""
 
-    def setUp(self):
+    def setup(self):
         """This method is run once before _each_ test method is executed"""
 
     def teardown(self):
         """This method is run once after _each_ test method is executed"""
 
     def test_str2bool(self):
-        nose.tools.assert_equal(utils.str2bool(True), True)
-        nose.tools.assert_equal(utils.str2bool(False), False)
-        nose.tools.assert_equal(utils.str2bool("True"), True)
-        nose.tools.assert_equal(utils.str2bool("YES"), True)
+        assert_equal(utils.str2bool(True), True)
+        assert_equal(utils.str2bool(False), False)
+        assert_equal(utils.str2bool("True"), True)
+        assert_equal(utils.str2bool("YES"), True)
 
     def test_parse_yaml(self):
-        nose.tools.assert_is_instance(utils.parse_yaml(NET_SETS), dict)
+        assert_is_instance(utils.parse_yaml(NET_SETS), dict)
 
     def test_dict_to_string(self):
         net_settings = NetworkSettings(NET_SETS)
         output = utils.dict_objects_to_str(net_settings)
-        nose.tools.assert_is_instance(output, dict)
+        assert_is_instance(output, dict)
         for k, v in output.items():
-            nose.tools.assert_is_instance(k, str)
-            nose.tools.assert_not_is_instance(v, ipaddress.IPv4Address)
+            assert_is_instance(k, str)
+            assert_not_is_instance(v, ipaddress.IPv4Address)
 
     def test_run_ansible(self):
         playbook = 'apex/tests/playbooks/test_playbook.yaml'
-        nose.tools.assert_equal(
-            utils.run_ansible(None, os.path.join(playbook),
-                              dry_run=True), None)
+        assert_equal(utils.run_ansible(None, os.path.join(playbook),
+                                       dry_run=True), None)