update ceph source to reef 18.2.0

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / api / test_lvm.py

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/api/test_lvm.py b/ceph/src/ceph-volume/ceph_volume/tests/api/test_lvm.py
index 0bfc34075c31c41b8569f5be57d357e4b906f044..603b2b85476eb8d2f4c54814b87141741896816c 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/api/test_lvm.py
+++ b/ceph/src/ceph-volume/ceph_volume/tests/api/test_lvm.py
@@ -69,7 +69,7 @@ class TestVolumeGroupFree(object):
 
 class TestCreateLVs(object):
 
-    def setup(self):
+    def setup_method(self):
         self.vg = api.VolumeGroup(vg_name='ceph',
                                          vg_extent_size=1073741824,
                                          vg_extent_count=99999999,
@@ -107,7 +107,7 @@ class TestCreateLVs(object):
 
 class TestVolumeGroupSizing(object):
 
-    def setup(self):
+    def setup_method(self):
         self.vg = api.VolumeGroup(vg_name='ceph',
                                          vg_extent_size=1073741824,
                                          vg_free_count=1024)
@@ -182,7 +182,7 @@ class TestRemoveLV(object):
 
 class TestCreateLV(object):
 
-    def setup(self):
+    def setup_method(self):
         self.foo_volume = api.Volume(lv_name='foo', lv_path='/path', vg_name='foo_group', lv_tags='')
         self.foo_group = api.VolumeGroup(vg_name='foo_group',
                                          vg_extent_size="4194304",
@@ -294,7 +294,7 @@ class TestCreateLV(object):
 
 class TestTags(object):
 
-    def setup(self):
+    def setup_method(self):
         self.foo_volume_clean = api.Volume(lv_name='foo_clean', lv_path='/pathclean',
             vg_name='foo_group',
             lv_tags='')
@@ -373,7 +373,7 @@ class TestTags(object):
 
 class TestExtendVG(object):
 
-    def setup(self):
+    def setup_method(self):
         self.foo_volume = api.VolumeGroup(vg_name='foo', lv_tags='')
 
     def test_uses_single_device_in_list(self, monkeypatch, fake_run):
@@ -397,7 +397,7 @@ class TestExtendVG(object):
 
 class TestReduceVG(object):
 
-    def setup(self):
+    def setup_method(self):
         self.foo_volume = api.VolumeGroup(vg_name='foo', lv_tags='')
 
     def test_uses_single_device_in_list(self, monkeypatch, fake_run):
@@ -421,7 +421,7 @@ class TestReduceVG(object):
 
 class TestCreateVG(object):
 
-    def setup(self):
+    def setup_method(self):
         self.foo_volume = api.VolumeGroup(vg_name='foo', lv_tags='')
 
     def test_no_name(self, monkeypatch, fake_run):