Migrates Apex to Python

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

diff --git a/tests/test_apex_inventory.py b/apex/tests/test_apex_inventory.py
similarity index 72%
rename from tests/test_apex_inventory.py
rename to apex/tests/test_apex_inventory.py
index ec75856..ed95c53 100644 (file)
--- a/tests/test_apex_inventory.py
+++ b/apex/tests/test_apex_inventory.py
@@ -7,21 +7,25 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+import os
 import sys
+from io import StringIO
 
-from apex.inventory import Inventory
-from apex.inventory import InventoryException
-
+from nose.tools import assert_equal
 from nose.tools import assert_is_instance
 from nose.tools import assert_raises
-from nose.tools import assert_equal
 from nose.tools import assert_regexp_matches
-from io import StringIO
+
+from apex import Inventory
+from apex.inventory.inventory import InventoryException
+from apex.tests.constants import TEST_CONFIG_DIR
 
 inventory_files = ('intel_pod2_settings.yaml',
                    'nokia_pod1_settings.yaml',
                    'pod_example_settings.yaml')
 
+files_dir = os.path.join(TEST_CONFIG_DIR, 'inventory')
+
 
 class TestInventory(object):
     @classmethod
@@ -40,7 +44,7 @@ class TestInventory(object):
 
     def test_init(self):
         for f in inventory_files:
-            i = Inventory('../config/inventory/{}'.format(f))
+            i = Inventory(os.path.join(files_dir, f))
             assert_equal(i.dump_instackenv_json(), None)
 
         # test virtual
@@ -59,23 +63,7 @@ class TestInventory(object):
         assert_raises(InventoryException,
                       Inventory, i, ha=False)
 
-    def test_exception(sefl):
+    def test_exception(self):
         e = InventoryException("test")
         print(e)
         assert_is_instance(e, InventoryException)
-
-    def test_dump_bash_default(self):
-        i = Inventory('../config/inventory/intel_pod2_settings.yaml')
-        out = StringIO()
-        sys.stdout = out
-        i.dump_bash()
-        output = out.getvalue().strip()
-        assert_regexp_matches(output, 'root_disk_list=sda')
-
-    def test_dump_bash_set_root_device(self):
-        i = Inventory('../config/inventory/pod_example_settings.yaml')
-        out = StringIO()
-        sys.stdout = out
-        i.dump_bash()
-        output = out.getvalue().strip()
-        assert_regexp_matches(output, 'root_disk_list=sdb')