diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2012-11-28 17:55:12 -0800 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2012-11-29 12:45:08 -0800 |
| commit | 49010b758865983567006c374cef88f916feaf0e (patch) | |
| tree | 13ac21e820bfad03aac3f2d762c6703092806a88 | |
| parent | 91fc376872516eb6259c24a17b78ede54681c17b (diff) | |
| download | nova-49010b758865983567006c374cef88f916feaf0e.tar.gz nova-49010b758865983567006c374cef88f916feaf0e.tar.xz nova-49010b758865983567006c374cef88f916feaf0e.zip | |
Fix test_inject_admin_password for OSX
On OSX DES is used instead of MD5, see
nova.virt.disk.api:_set_password for more details
Fix bug 1084337
Change-Id: I2490e1e322d42fecb43af5436fea2f903c11e265
| -rw-r--r-- | nova/tests/test_virt_disk.py | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/nova/tests/test_virt_disk.py b/nova/tests/test_virt_disk.py index cc69462d7..cc9b739ca 100644 --- a/nova/tests/test_virt_disk.py +++ b/nova/tests/test_virt_disk.py @@ -17,7 +17,6 @@ import sys from nova import test - from nova.tests import fakeguestfs from nova.virt.disk import api as diskapi from nova.virt.disk.vfs import api as vfsapi @@ -151,13 +150,28 @@ class VirtDiskTest(test.TestCase): 'isdir': False, 'mode': 0700, 'uid': 100}) - self.assertEquals(vfs.handle.files["/etc/shadow"], - {'content': "root:$1$12345678$a4ge4d5iJ5vw" + - "vbFS88TEN0:14917:0:99999:7:::\n" + - "bin:*:14495:0:99999:7:::\n" + - "daemon:*:14495:0:99999:7:::\n", - 'gid': 100, - 'isdir': False, - 'mode': 0700, - 'uid': 100}) + shadow = vfs.handle.files["/etc/shadow"] + + # if the encrypted password is only 13 characters long, then + # nova.virt.disk.api:_set_password fell back to DES. + if len(shadow['content']) == 91: + self.assertEquals(shadow, + {'content': "root:12tir.zIbWQ3c" + + ":14917:0:99999:7:::\n" + + "bin:*:14495:0:99999:7:::\n" + + "daemon:*:14495:0:99999:7:::\n", + 'gid': 100, + 'isdir': False, + 'mode': 0700, + 'uid': 100}) + else: + self.assertEquals(shadow, + {'content': "root:$1$12345678$a4ge4d5iJ5vw" + + "vbFS88TEN0:14917:0:99999:7:::\n" + + "bin:*:14495:0:99999:7:::\n" + + "daemon:*:14495:0:99999:7:::\n", + 'gid': 100, + 'isdir': False, + 'mode': 0700, + 'uid': 100}) vfs.teardown() |