tests deprecation message

Author: DuYicong515

tests/callbacks/test_gpu_stats_monitor.py

@@ -47,7 +47,9 @@ def test_gpu_stats_monitor(tmpdir):
         logger=logger,
     )
 
-    with pytest.deprecated_call(match="`Trainer.data_parallel_device_ids` was deprecated in v1.6."):
+    with pytest.deprecated_call(
+        match="Trainer.data_parallel_device_ids` was deprecated in v1.6 and will be removed in v1.8."
+    ):
         trainer.fit(model)
     assert trainer.state.finished, f"Training failed with {trainer.state}"
 
@@ -87,7 +89,9 @@ def test_gpu_stats_monitor_no_queries(tmpdir):
     )
     with mock.patch(
         "pytorch_lightning.loggers.tensorboard.TensorBoardLogger.log_metrics"
-    ) as log_metrics_mock, pytest.deprecated_call(match="`Trainer.data_parallel_device_ids` was deprecated in v1.6."):
+    ) as log_metrics_mock, pytest.deprecated_call(
+        match="Trainer.data_parallel_device_ids` was deprecated in v1.6 and will be removed in v1.8."
+    ):
         trainer.fit(model)
 
     assert log_metrics_mock.mock_calls[1:] == [

tests/models/test_gpu.py

@@ -245,10 +245,12 @@ def test_torchelastic_gpu_parsing(mocked_device_count, mocked_is_available, gpus
     assert isinstance(trainer._accelerator_connector.cluster_environment, TorchElasticEnvironment)
     assert trainer.gpus == gpus
     if rank_zero_only.rank == 0:
-        with pytest.deprecated_call(match="`Trainer.data_parallel_device_ids` was deprecated in v1.6."):
+        with pytest.deprecated_call(
+            match="Trainer.data_parallel_device_ids` was deprecated in v1.6 and will be removed in v1.8."
+        ):
             assert (trainer.data_parallel_device_ids or None) == device_parser.parse_gpu_ids(gpus)
     else:
-        assert trainer.data_parallel_device_ids == device_parser.parse_gpu_ids(gpus)
+        assert (trainer.data_parallel_device_ids or None) == device_parser.parse_gpu_ids(gpus)
 
 
 @RunIf(min_gpus=1)

tests/trainer/test_trainer_cli.py

@@ -176,7 +176,9 @@ def test_argparse_args_parsing_devices(cli_args, expected_parsed, expected_devic
 
     assert args.devices == expected_parsed
     trainer = Trainer.from_argparse_args(args)
-    with pytest.deprecated_call(match="`Trainer.data_parallel_device_ids` was deprecated in v1.6."):
+    with pytest.deprecated_call(
+        match="Trainer.data_parallel_device_ids` was deprecated in v1.6 and will be removed in v1.8."
+    ):
         assert trainer.data_parallel_device_ids == expected_device_ids
 
 

tests/utilities/test_cli.py

@@ -192,7 +192,9 @@ def test_parse_args_parsing_gpus(monkeypatch, cli_args, expected_gpu):
         args = parser.parse_args()
 
     trainer = Trainer.from_argparse_args(args)
-    with pytest.deprecated_call(match="`Trainer.data_parallel_device_ids` was deprecated in v1.6."):
+    with pytest.deprecated_call(
+        match="Trainer.data_parallel_device_ids` was deprecated in v1.6 and will be removed in v1.8."
+    ):
         assert trainer.data_parallel_device_ids == expected_gpu