Skip to content

Commit c816465

Browse files
committed
Remove test cross-talking
1 parent d229611 commit c816465

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

model-archiver/model_archiver/tests/integ_tests/test_integration_model_archiver.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ def delete_file_path(path):
4141

4242

4343
def run_test(test, args, mocker):
44-
m = mocker.Mock()
45-
m.parse_args = lambda: args
46-
mocker.patch(
44+
m = mocker.patch(
4745
"model_archiver.model_packaging.ArgParser.export_model_args_parser",
48-
return_value=m,
4946
)
47+
m.return_value.parse_args.return_value = args
5048
mocker.patch("sys.exit", side_effect=Exception())
5149
from model_archiver.model_packaging import generate_model_archive
5250

model-archiver/model_archiver/tests/unit_tests/test_model_packaging.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
import sys
21
from collections import namedtuple
32

43
import pytest
5-
from mock import MagicMock
6-
7-
sys.modules["shutil"] = MagicMock()
8-
sys.modules["shutil.rmtree"] = MagicMock()
9-
104
from model_archiver.manifest_components.manifest import RuntimeType
115
from model_archiver.model_packaging import generate_model_archive, package_model
126
from model_archiver.model_packaging_utils import ModelExportUtils
@@ -56,6 +50,7 @@ def patches(self, mocker):
5650
mocker.patch("model_archiver.model_packaging.ModelExportUtils"),
5751
mocker.patch("model_archiver.model_packaging.package_model"),
5852
)
53+
mocker.patch("shutil.rmtree")
5954

6055
return patches
6156

0 commit comments

Comments
 (0)