From f4ca6957cfa78aa1975763b973cfff7174ba7cb2 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 17 Dec 2012 16:38:16 -0500 Subject: [PATCH] fix test_nbd using stubs test_nbd was assigning object methods to fakes during tests, however the method name changed, and assigning to a new method doesn't cause an error. Change this to a stubs approach instead. Change-Id: I7f9bb0237bcea2a15505fe1ed0b0be438cdaefc2 --- nova/tests/virt/disk/test_nbd.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/nova/tests/virt/disk/test_nbd.py b/nova/tests/virt/disk/test_nbd.py index 17e149cbc90e..4b067d405f6a 100644 --- a/nova/tests/virt/disk/test_nbd.py +++ b/nova/tests/virt/disk/test_nbd.py @@ -73,13 +73,16 @@ def _fake_noop(*args, **kwargs): class NbdTestCase(test.TestCase): def setUp(self): super(NbdTestCase, self).setUp() + self.stubs.Set(nbd.NbdMount, '_detect_nbd_devices', + _fake_detect_nbd_devices) self.useFixture(fixtures.MonkeyPatch('os.listdir', _fake_listdir_nbd_devices)) def test_nbd_no_devices(self): tempdir = self.useFixture(fixtures.TempDir()).path + self.stubs.Set(nbd.NbdMount, '_detect_nbd_devices', + _fake_detect_nbd_devices_none) n = nbd.NbdMount(None, tempdir) - n.detect_nbd_device = _fake_detect_nbd_devices_none self.assertEquals(None, n._allocate_nbd()) def test_nbd_no_free_devices(self): @@ -109,7 +112,6 @@ class NbdTestCase(test.TestCase): def test_nbd_allocation(self): tempdir = self.useFixture(fixtures.TempDir()).path n = nbd.NbdMount(None, tempdir) - n.detect_nbd_device = _fake_detect_nbd_devices self.useFixture(fixtures.MonkeyPatch('os.path.exists', _fake_exists_no_users)) self.useFixture(fixtures.MonkeyPatch('random.shuffle', _fake_noop)) @@ -142,7 +144,6 @@ class NbdTestCase(test.TestCase): def test_inner_get_dev_no_devices(self): tempdir = self.useFixture(fixtures.TempDir()).path n = nbd.NbdMount(None, tempdir) - n.detect_nbd_device = _fake_detect_nbd_devices self.assertFalse(n._inner_get_dev()) def test_inner_get_dev_qemu_fails(self): @@ -163,7 +164,6 @@ class NbdTestCase(test.TestCase): def test_inner_get_dev_qemu_timeout(self): tempdir = self.useFixture(fixtures.TempDir()).path n = nbd.NbdMount(None, tempdir) - n.detect_nbd_device = _fake_detect_nbd_devices self.useFixture(fixtures.MonkeyPatch('os.path.exists', _fake_exists_no_users)) @@ -204,7 +204,6 @@ class NbdTestCase(test.TestCase): def test_inner_get_dev_works(self): tempdir = self.useFixture(fixtures.TempDir()).path n = nbd.NbdMount(None, tempdir) - n.detect_nbd_device = _fake_detect_nbd_devices self.useFixture(fixtures.MonkeyPatch('random.shuffle', _fake_noop)) self.useFixture(fixtures.MonkeyPatch('os.path.exists', self.fake_exists_one)) @@ -235,7 +234,6 @@ class NbdTestCase(test.TestCase): def test_get_dev(self): tempdir = self.useFixture(fixtures.TempDir()).path n = nbd.NbdMount(None, tempdir) - n.detect_nbd_device = _fake_detect_nbd_devices self.useFixture(fixtures.MonkeyPatch('random.shuffle', _fake_noop)) self.useFixture(fixtures.MonkeyPatch('nova.utils.execute', _fake_noop)) self.useFixture(fixtures.MonkeyPatch('os.path.exists', @@ -256,9 +254,13 @@ class NbdTestCase(test.TestCase): self.assertEquals(None, n.device) def test_get_dev_timeout(self): + # Always fail to get a device + def fake_get_dev_fails(self): + return False + self.stubs.Set(nbd.NbdMount, '_inner_get_dev', fake_get_dev_fails) + tempdir = self.useFixture(fixtures.TempDir()).path n = nbd.NbdMount(None, tempdir) - n.detect_nbd_device = _fake_detect_nbd_devices self.useFixture(fixtures.MonkeyPatch('random.shuffle', _fake_noop)) self.useFixture(fixtures.MonkeyPatch('time.sleep', _fake_noop)) self.useFixture(fixtures.MonkeyPatch('nova.utils.execute', _fake_noop)) @@ -269,10 +271,5 @@ class NbdTestCase(test.TestCase): self.useFixture(fixtures.MonkeyPatch(('nova.virt.disk.mount.nbd.' 'MAX_NBD_WAIT'), -10)) - # Always fail to get a device - def fake_get_dev_fails(): - return False - n._inner_get_dev = fake_get_dev_fails - # No error logged, device consumed self.assertFalse(n.get_dev())