Merge 8150e2f into e271454

Author: zhouzaida

tests/test_dataset/test_base_dataset.py

@@ -34,7 +34,7 @@ class CustomDataset(BaseDataset):
 
 class TestBaseDataset:
 
-    def setup(self):
+    def setup_method(self):
         self.data_info = dict(
             filename='test_img.jpg', height=604, width=640, sample_idx=0)
         self.imgs = torch.rand((2, 3, 32, 32))
@@ -43,7 +43,7 @@ def setup(self):
         BaseDataset.parse_data_info = MagicMock(return_value=self.data_info)
         self.pipeline = MagicMock(return_value=dict(imgs=self.imgs))
 
-    def teardown(self):
+    def teardown_method(self):
         BaseDataset.METAINFO = self.ori_meta
         BaseDataset.parse_data_info = self.ori_parse_data_info
 
@@ -595,7 +595,7 @@ def test_rand_another(self):
 
 class TestConcatDataset:
 
-    def setup(self):
+    def setup_method(self):
         dataset = BaseDataset
 
         # create dataset_a
@@ -726,7 +726,7 @@ def test_get_ori_dataset_idx(self):
 
 class TestRepeatDataset:
 
-    def setup(self):
+    def setup_method(self):
         dataset = BaseDataset
         data_info = dict(filename='test_img.jpg', height=604, width=640)
         dataset.parse_data_info = MagicMock(return_value=data_info)
@@ -797,7 +797,7 @@ def test_get_data_info(self):
 
 class TestClassBalancedDataset:
 
-    def setup(self):
+    def setup_method(self):
         dataset = BaseDataset
         data_info = dict(filename='test_img.jpg', height=604, width=640)
         dataset.parse_data_info = MagicMock(return_value=data_info)

tests/test_runner/test_log_processor.py

@@ -262,7 +262,7 @@ def test_get_cur_loop(self):
         loop = log_processor._get_cur_loop(self.runner, 'test')
         assert len(loop.dataloader) == 5
 
-    def setup(self):
+    def setup_method(self):
         runner = MagicMock()
         runner.epoch = 1
         runner.max_epochs = 10