nova.tests.test_virt_disk.VirtDiskTest.test_inject_admin_password fails on OS X

[Joe Gordon]

From unit tests launched via tox on OS X.

======================================================================
FAIL: nova.tests.test_virt_disk.VirtDiskTest.test_inject_admin_password
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/Users/jogo/Develop/nova_trunk/nova/nova/tests/test_virt_disk.py", line 162, in test_inject_admin_password
    'uid': 100})
MismatchError: !=:
reference = {'content': 'root:12tir.zIbWQ3c:14917:0:99999:7:::\nbin:*:14495:0:99999:7:::\ndaemon:*:14495:0:99999:7:::\n',
 'gid': 100,
 'isdir': False,
 'mode': 448,
 'uid': 100}
actual = {'content': 'root:$1$12345678$a4ge4d5iJ5vwvbFS88TEN0:14917:0:99999:7:::\nbin:*:14495:0:99999:7:::\ndaemon:*:14495:0:99999:7:::\n',
 'gid': 100,
 'isdir': False,
 'mode': 448,
 'uid': 100}

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/17097

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/17097
Committed: http://github.com/openstack/nova/commit/49010b758865983567006c374cef88f916feaf0e
Submitter: Jenkins
Branch: master

commit 49010b758865983567006c374cef88f916feaf0e
Author: Joe Gordon <email address hidden>
Date: Wed Nov 28 17:55:12 2012 -0800

    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