x

Author: tbzatek

src/tests/dbus-tests/test_nvme.py

@@ -917,29 +917,31 @@ def test_fabrics_multipath(self):
             ctrl_size.assertEqual(0)
 
         # count number of namespaces pointing to our controller
-        namespaces = self._find_block_objects_for_ctrl(ctrl_obj_path)
-        self.assertEqual(len(namespaces), self.NUM_NS)
-        namespaces = self._find_block_objects_for_ctrl(ctrl2_obj_path)
-        self.assertEqual(len(namespaces), 0)
+        ns_ctrl3 = ()
+        ns_ctrl1 = self._find_block_objects_for_ctrl(ctrl_obj_path)
+        ns_ctrl2 = self._find_block_objects_for_ctrl(ctrl2_obj_path)
         if self._ipv6_available:
-            namespaces = self._find_block_objects_for_ctrl(ctrl3_obj_path)
-            self.assertEqual(len(namespaces), 0)
+            ns_ctrl3 = self._find_block_objects_for_ctrl(ctrl3_obj_path)
+        self.assertEqual(len(ns_ctrl1) + len(ns_ctrl2) + len(ns_ctrl3), self.NUM_NS)
 
         # disconnect the first controller and watch the drive object references change
         ctrl.Disconnect(self.no_options, dbus_interface=self.iface_prefix + '.NVMe.Fabrics')
-        namespaces = self._find_block_objects_for_ctrl(ctrl_obj_path)
-        self.assertEqual(len(namespaces), 0)
-        namespaces = self._find_block_objects_for_ctrl(ctrl2_obj_path)
-        self.assertEqual(len(namespaces), self.NUM_NS)
+        ns_ctrl1 = self._find_block_objects_for_ctrl(ctrl_obj_path)
+        self.assertEqual(len(ns_ctrl1), 0)
+        ns_ctrl2 = self._find_block_objects_for_ctrl(ctrl2_obj_path)
+        ns_ctrl3 = ()
+        if self._ipv6_available:
+            ns_ctrl3 = self._find_block_objects_for_ctrl(ctrl3_obj_path)
+        self.assertEqual(len(ns_ctrl2) + len(ns_ctrl3), self.NUM_NS)
 
         ctrl2.Disconnect(self.no_options, dbus_interface=self.iface_prefix + '.NVMe.Fabrics')
         if self._ipv6_available:
-            namespaces = self._find_block_objects_for_ctrl(ctrl_obj_path)
-            self.assertEqual(len(namespaces), 0)
-            namespaces = self._find_block_objects_for_ctrl(ctrl2_obj_path)
-            self.assertEqual(len(namespaces), 0)
-            namespaces = self._find_block_objects_for_ctrl(ctrl3_obj_path)
-            self.assertEqual(len(namespaces), self.NUM_NS)
+            ns_ctrl1 = self._find_block_objects_for_ctrl(ctrl_obj_path)
+            self.assertEqual(len(ns_ctrl1), 0)
+            ns_ctrl2 = self._find_block_objects_for_ctrl(ctrl2_obj_path)
+            self.assertEqual(len(ns_ctrl2), 0)
+            ns_ctrl3 = self._find_block_objects_for_ctrl(ctrl3_obj_path)
+            self.assertEqual(len(ns_ctrl3), self.NUM_NS)
             ctrl3.Disconnect(self.no_options, dbus_interface=self.iface_prefix + '.NVMe.Fabrics')
 
     def test_hostnqn(self):