From 83be006e288c58a46f5b76c29b6886c1f417d88c Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Wed, 15 Mar 2017 10:19:34 +0100 Subject: Import patches-unapplied version 2.2.6-0ubuntu1 to ubuntu/zesty-proposed Imported using git-ubuntu import. Changelog parent: d064ab0bffd429382ea4fafeb144784d403848bd New changelog entries: * New upstream release (LP: #1661750). * debian/control: - Change the maintainer to Ubuntu Developers (LP: #1657528). - Add the dependency of isc-dhcp-client as our maintainer scripts assume it's installed. - Add trailing commas to dependencies, add whitespaces. * Rename ephemeral-disk-warning.sh to ephemeral-disk-warning (lintian error). * debian/docs: - Remove LICENSE.txt as it's redundant. * debian/postinst: - Stop checking for update-initramfs existence using the absolute path, use the 'command' command instead to make lintian happy. * Remove debian/patches/disable-auto-update.patch: - We now ship with auto-updates enabled (LP: #1650522). * debian/maintscript: - Add a maintscript to rename the old logrotate file on upgrade from an ancient version of walinuxagent (LP: #1673152). --- tests/utils/test_text_util.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests/utils/test_text_util.py') diff --git a/tests/utils/test_text_util.py b/tests/utils/test_text_util.py index dc3de85..6f204c7 100644 --- a/tests/utils/test_text_util.py +++ b/tests/utils/test_text_util.py @@ -23,12 +23,16 @@ from azurelinuxagent.common.future import ustr import azurelinuxagent.common.utils.textutil as textutil from azurelinuxagent.common.utils.textutil import Version + class TestTextUtil(AgentTestCase): def test_get_password_hash(self): - password_hash = textutil.gen_password_hash("asdf", 6, 10) - self.assertNotEquals(None, password_hash) - password_hash = textutil.gen_password_hash("asdf", 6, 0) - self.assertNotEquals(None, password_hash) + with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'test_passwords.txt'), 'rb') as in_file: + for data in in_file: + # Remove bom on bytes data before it is converted into string. + data = textutil.remove_bom(data) + data = ustr(data, encoding='utf-8') + password_hash = textutil.gen_password_hash(data, 6, 10) + self.assertNotEquals(None, password_hash) def test_remove_bom(self): #Test bom could be removed -- cgit v1.2.3