From f460f664d8940762843a6f169e894b5ac49fe5ac Mon Sep 17 00:00:00 2001 From: David Gardner Date: Wed, 5 Apr 2023 16:27:17 -0700 Subject: [PATCH] Fix invocation of reload_modules fixture --- tests/test_dfp.py | 9 +++------ tests/test_dfp_kafka.py | 7 ++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tests/test_dfp.py b/tests/test_dfp.py index df0969d6e1..7bb6820a99 100755 --- a/tests/test_dfp.py +++ b/tests/test_dfp.py @@ -47,8 +47,7 @@ @pytest.mark.slow @pytest.mark.use_python -@pytest.mark.reload_modules(preprocess_ae_stage) -@pytest.mark.reload_modules(train_ae_stage) +@pytest.mark.reload_modules([preprocess_ae_stage, train_ae_stage]) @pytest.mark.usefixtures("reload_modules") @mock.patch('morpheus.stages.preprocess.train_ae_stage.AutoEncoder') def test_dfp_roleg(mock_ae, config, tmp_path): @@ -131,8 +130,7 @@ def test_dfp_roleg(mock_ae, config, tmp_path): @pytest.mark.slow @pytest.mark.use_python -@pytest.mark.reload_modules(preprocess_ae_stage) -@pytest.mark.reload_modules(train_ae_stage) +@pytest.mark.reload_modules([preprocess_ae_stage, train_ae_stage]) @pytest.mark.usefixtures("reload_modules") @mock.patch('morpheus.stages.preprocess.train_ae_stage.AutoEncoder') def test_dfp_user123(mock_ae, config, tmp_path): @@ -213,8 +211,7 @@ def test_dfp_user123(mock_ae, config, tmp_path): @pytest.mark.slow @pytest.mark.use_python -@pytest.mark.reload_modules(preprocess_ae_stage) -@pytest.mark.reload_modules(train_ae_stage) +@pytest.mark.reload_modules([preprocess_ae_stage, train_ae_stage]) @pytest.mark.usefixtures("reload_modules") @mock.patch('morpheus.stages.preprocess.train_ae_stage.AutoEncoder') def test_dfp_user123_multi_segment(mock_ae, config, tmp_path): diff --git a/tests/test_dfp_kafka.py b/tests/test_dfp_kafka.py index 4a3ce82d1a..f6c073bd4a 100755 --- a/tests/test_dfp_kafka.py +++ b/tests/test_dfp_kafka.py @@ -55,9 +55,7 @@ @pytest.mark.kafka @pytest.mark.slow @pytest.mark.use_python -@pytest.mark.reload_modules(commands) -@pytest.mark.reload_modules(preprocess_ae_stage) -@pytest.mark.reload_modules(train_ae_stage) +@pytest.mark.reload_modules([commands, preprocess_ae_stage, train_ae_stage]) @pytest.mark.usefixtures("reload_modules") @mock.patch('morpheus.stages.preprocess.train_ae_stage.AutoEncoder') def test_dfp_roleg(mock_ae, @@ -159,8 +157,7 @@ def test_dfp_roleg(mock_ae, @pytest.mark.kafka @pytest.mark.slow @pytest.mark.use_python -@pytest.mark.reload_modules(preprocess_ae_stage) -@pytest.mark.reload_modules(train_ae_stage) +@pytest.mark.reload_modules([preprocess_ae_stage, train_ae_stage]) @pytest.mark.usefixtures("reload_modules") @mock.patch('morpheus.stages.preprocess.train_ae_stage.AutoEncoder') def test_dfp_user123(mock_ae,