Fix the last tests for ansible 2

Author: nsg

tests/test-include/inventory_tests.py

@@ -48,15 +48,18 @@ class AnsibleInventoryTests(unittest.TestCase):
     )
 
     def test_check_include_order(self):
-        yml = self.yml_inv.get_vars("myhost1.example.com")
+        host = self.yml_inv.list_hosts("myhost1.example.com")[0]
+        yml = self.var_manager.get_vars(self.dataloader, host=host)
         self.assertEqual(yml['dvar'], 1, msg="Error, dvar include wasn't a DFS")
 
     def test_check_include_twice(self):
-        yml1 = self.yml_inv.get_vars("www1.example.com")
-        yml2 = self.yml_inv.get_vars("www1.example.com")
+        host = self.yml_inv.list_hosts("www1.example.com")[0]
+        yml = self.var_manager.get_vars(self.dataloader, host=host)
+        self.assertEqual(yml['myvar1'], 3, msg="Error, failed to include twice!")
 
-        self.assertEqual(yml1['myvar1'], 3, msg="Error, failed to include twice!")
-        self.assertEqual(yml2['myvar1'], 3, msg="Error, failed to include twice!")
+        host = self.yml_inv.list_hosts("www2.example.com")[0]
+        yml = self.var_manager.get_vars(self.dataloader, host=host)
+        self.assertEqual(yml['myvar1'], 3, msg="Error, failed to include twice!")
 
 if __name__ == '__main__':
     print("\n### Execute test {}\n".format( __file__))

tests/test-plain/inventory_tests.py

@@ -67,6 +67,7 @@ def test_check_host_vars_and_groups(self):
 
     def test_list_hosts(self):
         yml = sorted(self.yml_inv.list_hosts())
+        yml = list(map((lambda x : repr(x).decode('utf-8')), yml))
         result = [u'myhost1.example.com', u'myhost2.example.com']
         self.assertListEqual(yml, result, msg="\nGot:    {}\nExpect: {}".format(yml, result))
 

tests/test-tags/inventory_tests.py

@@ -88,7 +88,9 @@ def test_check_host_with_name_syntax(self):
         self.assertDictEqual(yml, result, msg="\nGot:    {}\nExpect: {}".format(yml, result))
 
     def test_list_hosts(self):
-        yml = sorted(self.yml_inv.list_hosts())
+        yml = self.yml_inv.list_hosts()
+        yml = list(map((lambda x : repr(x).decode('utf-8')), yml))
+        yml = sorted(yml)
         result = [u'myhost1.example.com', u'myhost2.example.com']
         self.assertListEqual(yml, result, msg="\nGot:    {}\nExpect: {}".format(yml, result))
 

tests/test-tagvars/inventory_tests.py

@@ -48,15 +48,18 @@ class AnsibleInventoryTests(unittest.TestCase):
     )
 
     def test_check_tagvar_variable(self):
-        yml = self.yml_inv.get_vars("myhost1.example.com")
+        host = self.yml_inv.list_hosts("myhost1.example.com")[0]
+        yml = self.var_manager.get_vars(self.dataloader, host=host)
         self.assertEqual(yml['version'], 1.8, msg="Tagvar variable not set")
 
     def test_that_a_tagvars_supersedes_groupvar(self):
-        yml = self.yml_inv.get_vars("myhost1.example.com")
+        host = self.yml_inv.list_hosts("myhost1.example.com")[0]
+        yml = self.var_manager.get_vars(self.dataloader, host=host)
         self.assertEqual(yml['env'], u'stage', msg="env failed, got {}".format(yml['env']))
 
     def test_that_a_hostvars_supersedes_tagvars(self):
-        yml = self.yml_inv.get_vars("myhost1.example.com")
+        host = self.yml_inv.list_hosts("myhost1.example.com")[0]
+        yml = self.var_manager.get_vars(self.dataloader, host=host)
         self.assertEqual(yml['app'], u'app1', msg="app failed, got {}".format(yml['app']))
 
 if __name__ == '__main__':