diff options
author | Tim Rozet <trozet@redhat.com> | 2017-09-21 11:38:51 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2017-09-21 13:21:05 -0400 |
commit | 17d5b541e93f5d88ff958372cdf0b0b184bdbc27 (patch) | |
tree | 48d95bf35b0afd204029a2b87ab2e5c463a5fa17 /apex/tests/test_apex_inventory.py | |
parent | 330a071566034447fa6a4de17e56be1cceb1c83b (diff) |
Fixes removing inventory keys
Inventory keys that we want to delete were not being removed for
instackenv.json. Also fixes unit tests.
Change-Id: I7d6c752342db050d651953633f18e236f60334e3
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.py | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/apex/tests/test_apex_inventory.py b/apex/tests/test_apex_inventory.py index cca8068b..87e7d50b 100644 --- a/apex/tests/test_apex_inventory.py +++ b/apex/tests/test_apex_inventory.py @@ -16,7 +16,10 @@ from nose.tools import ( from apex import Inventory from apex.inventory.inventory import InventoryException -from apex.tests.constants import TEST_CONFIG_DIR +from apex.tests.constants import ( + TEST_CONFIG_DIR, + TEST_DUMMY_CONFIG +) inventory_files = ('intel_pod2_settings.yaml', 'nokia_pod1_settings.yaml', @@ -40,26 +43,26 @@ class TestInventory: def teardown(self): """This method is run once after _each_ test method is executed""" - def test_init(self): + def test_inventory_baremetal(self): for f in inventory_files: i = Inventory(os.path.join(files_dir, f)) assert_equal(i.dump_instackenv_json(), None) - # test virtual - i = Inventory(i, virtual=True) - assert_equal(i.dump_instackenv_json(), None) + def test_inventory_invalid_ha_count(self): + assert_raises(InventoryException, Inventory, + os.path.join(TEST_DUMMY_CONFIG, 'inventory-virt.yaml'), + virtual=True, ha=True) - # Remove nodes to violate HA node count - while len(i['nodes']) >= 5: - i['nodes'].pop() - assert_raises(InventoryException, - Inventory, i) + def test_inventory_invalid_noha_count(self): + assert_raises(InventoryException, Inventory, + os.path.join(TEST_DUMMY_CONFIG, + 'inventory-virt-1-node.yaml'), + virtual=True, ha=False) - # Remove nodes to violate non-HA node count - while len(i['nodes']) >= 2: - i['nodes'].pop() - assert_raises(InventoryException, - Inventory, i, ha=False) + def test_inventory_virtual(self): + i = Inventory(os.path.join(TEST_DUMMY_CONFIG, 'inventory-virt.yaml'), + virtual=True, ha=False) + assert_equal(i.dump_instackenv_json(), None) def test_exception(self): e = InventoryException("test") |