|
 |
cb9006 |
From 7c31cc534f96766dd2e3427b09d0affca66b0745 Mon Sep 17 00:00:00 2001
|
|
|
cb9006 |
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
|
cb9006 |
Date: Tue, 23 Mar 2021 13:54:02 +0100
|
|
|
cb9006 |
Subject: [PATCH 1/3] tests: Do not try to remove VG before removing the VDO
|
|
|
cb9006 |
pool
|
|
|
cb9006 |
|
|
|
cb9006 |
---
|
|
|
cb9006 |
tests/lvm_dbus_tests.py | 6 +++---
|
|
|
cb9006 |
tests/lvm_test.py | 6 +++---
|
|
|
cb9006 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
cb9006 |
|
|
|
cb9006 |
diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
index 8f2bb95d..b599fdd0 100644
|
|
|
cb9006 |
--- a/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
+++ b/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
@@ -1517,14 +1517,14 @@ def setUp(self):
|
|
|
cb9006 |
self.assertTrue(succ)
|
|
|
cb9006 |
|
|
|
cb9006 |
def _clean_up(self):
|
|
|
cb9006 |
- BlockDev.lvm_vgremove("testVDOVG")
|
|
|
cb9006 |
- BlockDev.lvm_pvremove(self.loop_dev)
|
|
|
cb9006 |
-
|
|
|
cb9006 |
try:
|
|
|
cb9006 |
BlockDev.lvm_lvremove("testVDOVG", "vdoPool", True, None)
|
|
|
cb9006 |
except:
|
|
|
cb9006 |
pass
|
|
|
cb9006 |
|
|
|
cb9006 |
+ BlockDev.lvm_vgremove("testVDOVG")
|
|
|
cb9006 |
+ BlockDev.lvm_pvremove(self.loop_dev)
|
|
|
cb9006 |
+
|
|
|
cb9006 |
try:
|
|
|
cb9006 |
delete_lio_device(self.loop_dev)
|
|
|
cb9006 |
except RuntimeError:
|
|
|
cb9006 |
diff --git a/tests/lvm_test.py b/tests/lvm_test.py
|
|
|
cb9006 |
index 6f80a3ba..6c04faf9 100644
|
|
|
cb9006 |
--- a/tests/lvm_test.py
|
|
|
cb9006 |
+++ b/tests/lvm_test.py
|
|
|
cb9006 |
@@ -1437,14 +1437,14 @@ def setUp(self):
|
|
|
cb9006 |
self.assertTrue(succ)
|
|
|
cb9006 |
|
|
|
cb9006 |
def _clean_up(self):
|
|
|
cb9006 |
- BlockDev.lvm_vgremove("testVDOVG")
|
|
|
cb9006 |
- BlockDev.lvm_pvremove(self.loop_dev)
|
|
|
cb9006 |
-
|
|
|
cb9006 |
try:
|
|
|
cb9006 |
BlockDev.lvm_lvremove("testVDOVG", "vdoPool", True, None)
|
|
|
cb9006 |
except:
|
|
|
cb9006 |
pass
|
|
|
cb9006 |
|
|
|
cb9006 |
+ BlockDev.lvm_vgremove("testVDOVG")
|
|
|
cb9006 |
+ BlockDev.lvm_pvremove(self.loop_dev)
|
|
|
cb9006 |
+
|
|
|
cb9006 |
try:
|
|
|
cb9006 |
delete_lio_device(self.loop_dev)
|
|
|
cb9006 |
except RuntimeError:
|
|
|
cb9006 |
|
|
|
cb9006 |
From 41b9d745b8c1a33221e15683f390bae180d1e960 Mon Sep 17 00:00:00 2001
|
|
|
cb9006 |
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
|
cb9006 |
Date: Tue, 23 Mar 2021 13:59:24 +0100
|
|
|
cb9006 |
Subject: [PATCH 2/3] tests: Force remove LVM VG /dev/ entry not removed by
|
|
|
cb9006 |
vgremove
|
|
|
cb9006 |
|
|
|
cb9006 |
The directory is sometimes not removed. This is a known bug that
|
|
|
cb9006 |
causes subsequent test cases to fail.
|
|
|
cb9006 |
---
|
|
|
cb9006 |
tests/lvm_dbus_tests.py | 6 ++++++
|
|
|
cb9006 |
tests/lvm_test.py | 6 ++++++
|
|
|
cb9006 |
2 files changed, 12 insertions(+)
|
|
|
cb9006 |
|
|
|
cb9006 |
diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
index b599fdd0..3278716e 100644
|
|
|
cb9006 |
--- a/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
+++ b/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
@@ -399,6 +399,9 @@ def _clean_up(self):
|
|
|
cb9006 |
except:
|
|
|
cb9006 |
pass
|
|
|
cb9006 |
|
|
|
cb9006 |
+ # XXX remove lingering /dev entries
|
|
|
cb9006 |
+ shutil.rmtree("/dev/testVG", ignore_errors=True)
|
|
|
cb9006 |
+
|
|
|
cb9006 |
LvmPVonlyTestCase._clean_up(self)
|
|
|
cb9006 |
|
|
|
cb9006 |
@unittest.skipUnless(lvm_dbus_running, "LVM DBus not running")
|
|
|
cb9006 |
@@ -1525,6 +1528,9 @@ def _clean_up(self):
|
|
|
cb9006 |
BlockDev.lvm_vgremove("testVDOVG")
|
|
|
cb9006 |
BlockDev.lvm_pvremove(self.loop_dev)
|
|
|
cb9006 |
|
|
|
cb9006 |
+ # XXX remove lingering /dev entries
|
|
|
cb9006 |
+ shutil.rmtree("/dev/testVDOVG", ignore_errors=True)
|
|
|
cb9006 |
+
|
|
|
cb9006 |
try:
|
|
|
cb9006 |
delete_lio_device(self.loop_dev)
|
|
|
cb9006 |
except RuntimeError:
|
|
|
cb9006 |
diff --git a/tests/lvm_test.py b/tests/lvm_test.py
|
|
|
cb9006 |
index 6c04faf9..d7e1f84c 100644
|
|
|
cb9006 |
--- a/tests/lvm_test.py
|
|
|
cb9006 |
+++ b/tests/lvm_test.py
|
|
|
cb9006 |
@@ -378,6 +378,9 @@ def _clean_up(self):
|
|
|
cb9006 |
except:
|
|
|
cb9006 |
pass
|
|
|
cb9006 |
|
|
|
cb9006 |
+ # XXX remove lingering /dev entries
|
|
|
cb9006 |
+ shutil.rmtree("/dev/testVG", ignore_errors=True)
|
|
|
cb9006 |
+
|
|
|
cb9006 |
LvmPVonlyTestCase._clean_up(self)
|
|
|
cb9006 |
|
|
|
cb9006 |
class LvmTestVGcreateRemove(LvmPVVGTestCase):
|
|
|
cb9006 |
@@ -1445,6 +1448,9 @@ def _clean_up(self):
|
|
|
cb9006 |
BlockDev.lvm_vgremove("testVDOVG")
|
|
|
cb9006 |
BlockDev.lvm_pvremove(self.loop_dev)
|
|
|
cb9006 |
|
|
|
cb9006 |
+ # XXX remove lingering /dev entries
|
|
|
cb9006 |
+ shutil.rmtree("/dev/testVDOVG", ignore_errors=True)
|
|
|
cb9006 |
+
|
|
|
cb9006 |
try:
|
|
|
cb9006 |
delete_lio_device(self.loop_dev)
|
|
|
cb9006 |
except RuntimeError:
|
|
|
cb9006 |
|
|
|
cb9006 |
From 4ecf0075cedf3a1d275d34b94ce5bb512c4e970e Mon Sep 17 00:00:00 2001
|
|
|
cb9006 |
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
|
cb9006 |
Date: Tue, 23 Mar 2021 14:03:44 +0100
|
|
|
cb9006 |
Subject: [PATCH 3/3] tests: Tag LvmPVVGLVcachePoolCreateRemoveTestCase as
|
|
|
cb9006 |
unstable
|
|
|
cb9006 |
|
|
|
cb9006 |
LVM randomly fails to activate the newly created metadata LV.
|
|
|
cb9006 |
Issue is reported to LVM and not yet fixed.
|
|
|
cb9006 |
---
|
|
|
cb9006 |
tests/lvm_dbus_tests.py | 2 +-
|
|
|
cb9006 |
tests/lvm_test.py | 2 +-
|
|
|
cb9006 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
cb9006 |
|
|
|
cb9006 |
diff --git a/tests/lvm_dbus_tests.py b/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
index 3278716e..4882da88 100644
|
|
|
cb9006 |
--- a/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
+++ b/tests/lvm_dbus_tests.py
|
|
|
cb9006 |
@@ -1213,7 +1213,7 @@ def _clean_up(self):
|
|
|
cb9006 |
|
|
|
cb9006 |
@unittest.skipUnless(lvm_dbus_running, "LVM DBus not running")
|
|
|
cb9006 |
class LvmPVVGLVcachePoolCreateRemoveTestCase(LvmPVVGLVcachePoolTestCase):
|
|
|
cb9006 |
- @tag_test(TestTags.SLOW)
|
|
|
cb9006 |
+ @tag_test(TestTags.SLOW, TestTags.UNSTABLE)
|
|
|
cb9006 |
def test_cache_pool_create_remove(self):
|
|
|
cb9006 |
"""Verify that is it possible to create and remove a cache pool"""
|
|
|
cb9006 |
|
|
|
cb9006 |
diff --git a/tests/lvm_test.py b/tests/lvm_test.py
|
|
|
cb9006 |
index d7e1f84c..eb94c917 100644
|
|
|
cb9006 |
--- a/tests/lvm_test.py
|
|
|
cb9006 |
+++ b/tests/lvm_test.py
|
|
|
cb9006 |
@@ -1129,7 +1129,7 @@ def _clean_up(self):
|
|
|
cb9006 |
LvmPVVGLVTestCase._clean_up(self)
|
|
|
cb9006 |
|
|
|
cb9006 |
class LvmPVVGLVcachePoolCreateRemoveTestCase(LvmPVVGLVcachePoolTestCase):
|
|
|
cb9006 |
- @tag_test(TestTags.SLOW)
|
|
|
cb9006 |
+ @tag_test(TestTags.SLOW, TestTags.UNSTABLE)
|
|
|
cb9006 |
def test_cache_pool_create_remove(self):
|
|
|
cb9006 |
"""Verify that is it possible to create and remove a cache pool"""
|
|
|
cb9006 |
|