summaryrefslogtreecommitdiffstats
path: root/apex/tests/test_apex_inventory.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-06 14:33:18 -0400
committerTim Rozet <trozet@redhat.com>2017-09-06 19:02:27 +0000
commitf443d4ea68736bfb7849f83ed054fcbd51971765 (patch)
treeec73ab09401bbcb18ed0681835d8a10f9f3dadea /apex/tests/test_apex_inventory.py
parent27018324387d4ef0efa908b315403a636f92de55 (diff)
Adds parser tests and cleanup
Adds unit testing for the common/parsers library and cleans up some of the test files syntax. Change-Id: I7ff9d7ba20b028fba410af900a0c3107a5806d8f Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/tests/test_apex_inventory.py')
-rw-r--r--apex/tests/test_apex_inventory.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/apex/tests/test_apex_inventory.py b/apex/tests/test_apex_inventory.py
index ed95c53c..cca8068b 100644
--- a/apex/tests/test_apex_inventory.py
+++ b/apex/tests/test_apex_inventory.py
@@ -8,13 +8,11 @@
##############################################################################
import os
-import sys
-from io import StringIO
-from nose.tools import assert_equal
-from nose.tools import assert_is_instance
-from nose.tools import assert_raises
-from nose.tools import assert_regexp_matches
+from nose.tools import (
+ assert_equal,
+ assert_is_instance,
+ assert_raises)
from apex import Inventory
from apex.inventory.inventory import InventoryException
@@ -27,16 +25,16 @@ inventory_files = ('intel_pod2_settings.yaml',
files_dir = os.path.join(TEST_CONFIG_DIR, 'inventory')
-class TestInventory(object):
+class TestInventory:
@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):