Merge branch 'unit-tests' of https://github.com/sivel/ansible into sivel-unit-tests

test/units/TestModuleUtilsBasic.py

@@ -50,8 +50,13 @@ class TestModuleUtilsBasic(unittest.TestCase):
         exec(module_data, d, d)
         self.module = d['get_module']()
 
+        # module_utils/basic.py screws with CWD, let's save it and reset
+        self.cwd = os.getcwd()
+
     def tearDown(self):
         self.cleanup_temp_file(self.tmp_fd, self.tmp_path)
+        # Reset CWD back to what it was before basic.py changed it
+        os.chdir(self.cwd)
 
     #################################################################################
     # run_command() tests
@@ -147,7 +152,7 @@ class TestModuleUtilsBasic(unittest.TestCase):
             (rc, out, err) = self.module.run_command('pwd', cwd=tmp_path)
             self.assertEqual(rc, 0)
             self.assertTrue(os.path.exists(tmp_path))
-            self.assertEqual(out.strip(), tmp_path)
+            self.assertEqual(out.strip(), os.path.realpath(tmp_path))
         except:
             raise
         finally:

test/units/TestUtilsStringFunctions.py

+# -*- coding: utf-8 -*-
+
+import unittest
+import os
+import os.path
+import tempfile
+import yaml
+import passlib.hash
+import string
+import StringIO
+import copy
+
+from nose.plugins.skip import SkipTest
+
+from ansible.utils import string_functions
+import ansible.errors
+import ansible.constants as C
+import ansible.utils.template as template2
+
+from ansible import __version__
+
+import sys
+reload(sys)
+sys.setdefaultencoding("utf8") 
+
+class TestUtilsStringFunctions(unittest.TestCase):
+    def test_isprintable(self):
+        self.assertFalse(string_functions.isprintable(chr(7)))
+        self.assertTrue(string_functions.isprintable('hello'))
+
+    def test_count_newlines_from_end(self):
+        self.assertEqual(string_functions.count_newlines_from_end('foo\n\n\n\n'), 4)
+        self.assertEqual(string_functions.count_newlines_from_end('\nfoo'), 0)

test/units/inventory_test_data/broken.yml

+foo: bar
+ baz: qux

test/units/inventory_test_data/encrypted.yml

+$ANSIBLE_VAULT;1.1;AES256
+33343734386261666161626433386662623039356366656637303939306563376130623138626165
+6436333766346533353463636566313332623130383662340a393835656134633665333861393331
+37666233346464636263636530626332623035633135363732623332313534306438393366323966
+3135306561356164310a343937653834643433343734653137383339323330626437313562306630
+3035