diff options
author | Ćukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2017-03-15 10:19:34 +0100 |
---|---|---|
committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-03-17 13:08:24 +0000 |
commit | c6339c307f36f77a4198d6faf1275acdf371200b (patch) | |
tree | c774046e1e30617514c09e5a2b896568706a25a8 /tests/utils/test_text_util.py | |
parent | dd73af563850762aad64e7ed2a9897377830af10 (diff) | |
parent | 2bc77af05fe602a2ba92569428c6006d1aebd19f (diff) | |
download | vyos-walinuxagent-c6339c307f36f77a4198d6faf1275acdf371200b.tar.gz vyos-walinuxagent-c6339c307f36f77a4198d6faf1275acdf371200b.zip |
Import patches-applied version 2.2.6-0ubuntu1 to applied/ubuntu/zesty-proposed
Imported using git-ubuntu import.
Changelog parent: dd73af563850762aad64e7ed2a9897377830af10
Unapplied parent: 2bc77af05fe602a2ba92569428c6006d1aebd19f
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).
Diffstat (limited to 'tests/utils/test_text_util.py')
-rw-r--r-- | tests/utils/test_text_util.py | 12 |
1 files changed, 8 insertions, 4 deletions
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 |