From 7c31cc534f96766dd2e3427b09d0affca66b0745 Mon Sep 17 00:00:00 2001

From: Vojtech Trefny <vtrefny@redhat.com>

Date: Tue, 23 Mar 2021 13:54:02 +0100

Subject: [PATCH 1/3] tests: Do not try to remove VG before removing the VDO

 pool

---

 tests/lvm_dbus_tests.py | 6 +++---

 tests/lvm_test.py       | 6 +++---

 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py

index 8f2bb95d..b599fdd0 100644

--- a/tests/lvm_dbus_tests.py

+++ b/tests/lvm_dbus_tests.py

@@ -1517,14 +1517,14 @@ def setUp(self):

         self.assertTrue(succ)

     def _clean_up(self):

-        BlockDev.lvm_vgremove("testVDOVG")

-        BlockDev.lvm_pvremove(self.loop_dev)

-

         try:

             BlockDev.lvm_lvremove("testVDOVG", "vdoPool", True, None)

         except:

             pass

+        BlockDev.lvm_vgremove("testVDOVG")

+        BlockDev.lvm_pvremove(self.loop_dev)

+

         try:

             delete_lio_device(self.loop_dev)

         except RuntimeError:

diff --git a/tests/lvm_test.py b/tests/lvm_test.py

index 6f80a3ba..6c04faf9 100644

--- a/tests/lvm_test.py

+++ b/tests/lvm_test.py

@@ -1437,14 +1437,14 @@ def setUp(self):

         self.assertTrue(succ)

     def _clean_up(self):

-        BlockDev.lvm_vgremove("testVDOVG")

-        BlockDev.lvm_pvremove(self.loop_dev)

-

         try:

             BlockDev.lvm_lvremove("testVDOVG", "vdoPool", True, None)

         except:

             pass

+        BlockDev.lvm_vgremove("testVDOVG")

+        BlockDev.lvm_pvremove(self.loop_dev)

+

         try:

             delete_lio_device(self.loop_dev)

         except RuntimeError:

From 41b9d745b8c1a33221e15683f390bae180d1e960 Mon Sep 17 00:00:00 2001

From: Vojtech Trefny <vtrefny@redhat.com>

Date: Tue, 23 Mar 2021 13:59:24 +0100

Subject: [PATCH 2/3] tests: Force remove LVM VG /dev/ entry not removed by

 vgremove

The directory is sometimes not removed. This is a known bug that

causes subsequent test cases to fail.

---

 tests/lvm_dbus_tests.py | 6 ++++++

 tests/lvm_test.py       | 6 ++++++

 2 files changed, 12 insertions(+)

diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py

index b599fdd0..3278716e 100644

--- a/tests/lvm_dbus_tests.py

+++ b/tests/lvm_dbus_tests.py

@@ -399,6 +399,9 @@ def _clean_up(self):

         except:

             pass

+        # XXX remove lingering /dev entries

+        shutil.rmtree("/dev/testVG", ignore_errors=True)

+

         LvmPVonlyTestCase._clean_up(self)

 @unittest.skipUnless(lvm_dbus_running, "LVM DBus not running")

@@ -1525,6 +1528,9 @@ def _clean_up(self):

         BlockDev.lvm_vgremove("testVDOVG")

         BlockDev.lvm_pvremove(self.loop_dev)

+        # XXX remove lingering /dev entries

+        shutil.rmtree("/dev/testVDOVG", ignore_errors=True)

+

         try:

             delete_lio_device(self.loop_dev)

         except RuntimeError:

diff --git a/tests/lvm_test.py b/tests/lvm_test.py

index 6c04faf9..d7e1f84c 100644

--- a/tests/lvm_test.py

+++ b/tests/lvm_test.py

@@ -378,6 +378,9 @@ def _clean_up(self):

         except:

             pass

+        # XXX remove lingering /dev entries

+        shutil.rmtree("/dev/testVG", ignore_errors=True)

+

         LvmPVonlyTestCase._clean_up(self)

 class LvmTestVGcreateRemove(LvmPVVGTestCase):

@@ -1445,6 +1448,9 @@ def _clean_up(self):

         BlockDev.lvm_vgremove("testVDOVG")

         BlockDev.lvm_pvremove(self.loop_dev)

+        # XXX remove lingering /dev entries

+        shutil.rmtree("/dev/testVDOVG", ignore_errors=True)

+

         try:

             delete_lio_device(self.loop_dev)

         except RuntimeError:

From 4ecf0075cedf3a1d275d34b94ce5bb512c4e970e Mon Sep 17 00:00:00 2001

From: Vojtech Trefny <vtrefny@redhat.com>

Date: Tue, 23 Mar 2021 14:03:44 +0100

Subject: [PATCH 3/3] tests: Tag LvmPVVGLVcachePoolCreateRemoveTestCase as

 unstable

LVM randomly fails to activate the newly created metadata LV.

Issue is reported to LVM and not yet fixed.

---

 tests/lvm_dbus_tests.py | 2 +-

 tests/lvm_test.py       | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py

index 3278716e..4882da88 100644

--- a/tests/lvm_dbus_tests.py

+++ b/tests/lvm_dbus_tests.py

@@ -1213,7 +1213,7 @@ def _clean_up(self):

 @unittest.skipUnless(lvm_dbus_running, "LVM DBus not running")

 class LvmPVVGLVcachePoolCreateRemoveTestCase(LvmPVVGLVcachePoolTestCase):

-    @tag_test(TestTags.SLOW)

+    @tag_test(TestTags.SLOW, TestTags.UNSTABLE)

     def test_cache_pool_create_remove(self):

         """Verify that is it possible to create and remove a cache pool"""

diff --git a/tests/lvm_test.py b/tests/lvm_test.py

index d7e1f84c..eb94c917 100644

--- a/tests/lvm_test.py

+++ b/tests/lvm_test.py

@@ -1129,7 +1129,7 @@ def _clean_up(self):

         LvmPVVGLVTestCase._clean_up(self)

 class LvmPVVGLVcachePoolCreateRemoveTestCase(LvmPVVGLVcachePoolTestCase):

-    @tag_test(TestTags.SLOW)

+    @tag_test(TestTags.SLOW, TestTags.UNSTABLE)

     def test_cache_pool_create_remove(self):

         """Verify that is it possible to create and remove a cache pool"""