diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-07 17:36:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-07 17:36:51 +0000 |
| commit | ac121a253670d020789636b7bcd4e8df0bf6d419 (patch) | |
| tree | aef7c7cbb96918bdd019930609d4e99e2082e7b6 | |
| parent | ca3c98bdb84d29bc460dd117598ea59c5dc2ae28 (diff) | |
| parent | 820ac93531b4f7254cd73b7e98b93dbf361e173f (diff) | |
| download | nova-ac121a253670d020789636b7bcd4e8df0bf6d419.tar.gz nova-ac121a253670d020789636b7bcd4e8df0bf6d419.tar.xz nova-ac121a253670d020789636b7bcd4e8df0bf6d419.zip | |
Merge "Remove deprecated use Exception.message"
| -rw-r--r-- | nova/tests/test_libvirt.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index db00334ea..c43512c10 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -1928,9 +1928,9 @@ class LibvirtConnTestCase(test.TestCase): conn.spawn(self.context, instance, None, network_info) except Exception, e: # assert that no exception is raised due to sha1 receiving an int - self.assertEqual(-1, str(e.message).find('must be string or buffer' - ', not int')) - count = (0 <= str(e.message).find('Unexpected method call')) + self.assertEqual(-1, unicode(e).find('must be string or buffer' + ', not int')) + count = (0 <= unicode(e).find('Unexpected method call')) path = os.path.join(FLAGS.instances_path, instance.name) if os.path.isdir(path): |