Skip to content

Commit 8f018d7

Browse files
committed
rbd: Get rbd_utils unit tests running again
Awhile back, change I25baf5edd25d9e551686b7ed317a63fd778be533 moved rbd_utils out from the libvirt driver and into a central location under nova/storage. This move missed adding a __init__.py file under nova/tests/unit/storage, so unit test discovery wasn't picking up the rbd_utils tests and couldn't run them. This adds a __init__.py file under nova/tests/unit/storage to get the tests running again. This also fixes a small bug introduced by change I3032bbe6bd2d6acc9ba0f0cac4d00ed4b4464ceb in RbdTestCase.setUp() that passed nonexistent self.images_rbd_pool to self.flags. It should be self.rbd_pool. Closes-Bug: #1928007 Change-Id: Ic03a5336abdced883f62f395690c0feac12075c8 (cherry picked from commit 8b647f1)
1 parent a5ce4d8 commit 8f018d7

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

nova/tests/unit/storage/__init__.py

Whitespace-only changes.

nova/tests/unit/storage/test_rbd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def setUp(self):
110110
self.rbd_pool = 'rbd'
111111
self.rbd_connect_timeout = 5
112112
self.flags(
113-
images_rbd_pool=self.images_rbd_pool,
113+
images_rbd_pool=self.rbd_pool,
114114
images_rbd_ceph_conf='/foo/bar.conf',
115115
rbd_connect_timeout=self.rbd_connect_timeout,
116116
rbd_user='foo', group='libvirt')

0 commit comments

Comments
 (0)