Merge branch 'empty_inventory' of https://github.com/spil-jasper/ansible into spil-jasper-empty_inventory

lib/ansible/inventory/__init__.py

@@ -70,7 +70,9 @@ class Inventory(object):
                 host_list = host_list.split(",")
                 host_list = [ h for h in host_list if h and h.strip() ]
 
-        if isinstance(host_list, list):
+        if host_list is None:
+            self.parser = None
+        elif isinstance(host_list, list):
             self.parser = None
             all = Group('all')
             self.groups = [ all ]

test/TestInventory.py

@@ -30,6 +30,9 @@ class TestInventory(unittest.TestCase):
         print right
         assert left == right
 
+    def empty_inventory(self):
+        return Inventory(None)
+
     def simple_inventory(self):
         return Inventory(self.inventory_file)
 
@@ -54,6 +57,14 @@ class TestInventory(unittest.TestCase):
             'Hotep-a', 'Hotep-b', 'Hotep-c',
             'BastC', 'BastD', ]
 
+    #####################################
+    ### Empty inventory format tests
+
+    def test_empty(self):
+        inventory = self.empty_inventory()
+        hosts = inventory.list_hosts()
+        self.assertEqual(hosts, [])
+
     #####################################
     ### Simple inventory format tests