Import patches-applied version 2.2.16-0ubuntu1 to applied/ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 70c0ea1ac879b2e1cba0a8edb1f3fbe82652413b
Unapplied parent: 3a1d96a77ccaf023256d16183428e3d895f8a051

New changelog entries:
  * New upstream release (LP: #1714299).

1 files changed, 44 insertions, 0 deletions

diff --git a/tests/utils/test_text_util.py b/tests/utils/test_text_util.py
index 6f204c7..d182a67 100644
--- a/tests/utils/test_text_util.py
+++ b/tests/utils/test_text_util.py
@@ -34,6 +34,19 @@ class TestTextUtil(AgentTestCase):
                 password_hash = textutil.gen_password_hash(data, 6, 10)
                 self.assertNotEquals(None, password_hash)
 
+    def test_replace_non_ascii(self):
+        data = ustr(b'\xef\xbb\xbfhehe', encoding='utf-8')
+        self.assertEqual('hehe', textutil.replace_non_ascii(data))
+
+        data = "abcd\xa0e\xf0fghijk\xbblm"
+        self.assertEqual("abcdefghijklm", textutil.replace_non_ascii(data))
+
+        data = "abcd\xa0e\xf0fghijk\xbblm"
+        self.assertEqual("abcdXeXfghijkXlm",
+            textutil.replace_non_ascii(data, replace_char='X'))
+
+        self.assertEqual('', textutil.replace_non_ascii(None))
+
     def test_remove_bom(self):
         #Test bom could be removed
         data = ustr(b'\xef\xbb\xbfhehe', encoding='utf-8')
@@ -94,6 +107,37 @@ class TestTextUtil(AgentTestCase):
                    "-----END PRIVATE Key-----\n")
         base64_bytes = textutil.get_bytes_from_pem(content)
         self.assertEquals("private key", base64_bytes)
+
+    def test_swap_hexstring(self):
+        data = [
+            ['12', 1, '21'],
+            ['12', 2, '12'],
+            ['12', 3, '012'],
+            ['12', 4, '0012'],
+
+            ['123', 1, '321'],
+            ['123', 2, '2301'],
+            ['123', 3, '123'],
+            ['123', 4, '0123'],
+
+            ['1234', 1, '4321'],
+            ['1234', 2, '3412'],
+            ['1234', 3, '234001'],
+            ['1234', 4, '1234'],
+
+            ['abcdef12', 1, '21fedcba'],
+            ['abcdef12', 2, '12efcdab'],
+            ['abcdef12', 3, 'f12cde0ab'],
+            ['abcdef12', 4, 'ef12abcd'],
+
+            ['aBcdEf12', 1, '21fEdcBa'],
+            ['aBcdEf12', 2, '12EfcdaB'],
+            ['aBcdEf12', 3, 'f12cdE0aB'],
+            ['aBcdEf12', 4, 'Ef12aBcd']
+        ]
+
+        for t in data:
+            self.assertEqual(t[2], textutil.swap_hexstring(t[0], width=t[1]))
         
 if __name__ == '__main__':
     unittest.main()