CA-335178: Fix unitialized variable

Signed-off-by: ben sims <ben.sims@citrix.com>
xapi-project · Feb 24, 2020 · a9a7a4c · a9a7a4c
1 parent 1c4985b
commit a9a7a4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/drivers/blktap2.py b/drivers/blktap2.py
@@ -1020,6 +1020,7 @@ def __init__(self, uuid, target, driver_info):
         self.__o_direct  = None
         self.__o_direct_reason = None
         self.lock        = Lock("vdi", uuid)
+        self.tap         = None
 
     def get_o_direct_capability(self, options):
         """Returns True/False based on licensing and caching_params"""

diff --git a/tests/test_blktap2.py b/tests/test_blktap2.py
@@ -34,6 +34,12 @@ def test_get_tap_type_returns_aio_for_udev_device(self):
     class NBDLinkForTest(blktap2.VDI.NBDLink):
         __name__ = "bob"
 
+    @mock.patch('blktap2.VDI.NBDLink', autospec=NBDLinkForTest)
+    @mock.patch('blktap2.VDI.NBDLink', autospec=NBDLinkForTest)
+    def test_linknbd_not_called_for_no_tap(self, nbd_link2, nbd_link):
+        self.vdi.linkNBD("blahblah", "yadayada")
+        self.assertEquals(nbd_link.from_uuid.call_count, 0)
+
     @mock.patch('blktap2.VDI.NBDLink', autospec=NBDLinkForTest)
     @mock.patch('blktap2.VDI.NBDLink', autospec=NBDLinkForTest)
     def test_linknbd(self, nbd_link2, nbd_link):