Skip to content

Commit bd3db07

Browse files
Fix test failures (#5574)
* Fix unit tests failure * Continue improvement * bump pytest version in test_requirements.txt * Fix unit tests for py39 and py312 * revert test_requirements version bump for pytest * Add setuptools to tox.ini * Update tox.ini for preinstall of setuptools * Update tox.ini install_command * Revert tox.ini fix, update test_requirements for pytest-rerunfailures * Update test_requirements.txt for pytest-rerunfailures * Set upper bound for setuptools * Dockerfile pin setuptools version for integ test multimodel * Black format
1 parent be0d6b5 commit bd3db07

File tree

10 files changed

+35
-10
lines changed

10 files changed

+35
-10
lines changed

requirements/extras/test_requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
tox==3.24.5
2+
setuptools<72.0.0
23
numpy>=2.0.0, <3.0
34
build[virtualenv]==1.2.1
45
flake8==7.1.2
56
pytest==6.2.5
67
pytest-cov==3.0.0
7-
pytest-rerunfailures==10.2
8+
pytest-rerunfailures<14.0,>=11.0
89
pytest-timeout==2.1.0
910
pytest-xdist==2.4.0
1011
coverage>=5.2, <6.2

tests/data/multimodel/container/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
2323
RUN update-alternatives --install /usr/local/bin/pip pip /usr/local/bin/pip3 1
2424

2525
# Install MXNet, MMS, and SageMaker Inference Toolkit to set up MMS
26-
RUN pip3 --no-cache-dir install mxnet \
26+
RUN pip3 --no-cache-dir install 'setuptools<72.0.0' \
27+
mxnet \
2728
multi-model-server \
2829
sagemaker-inference \
2930
retrying

tests/unit/sagemaker/feature_store/test_dataset_builder.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131

3232
@pytest.fixture
3333
def sagemaker_session_mock():
34-
return Mock()
34+
mock = Mock()
35+
mock.sagemaker_config = None
36+
return mock
3537

3638

3739
@pytest.fixture

tests/unit/sagemaker/feature_store/test_feature_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def s3_uri():
6868
@pytest.fixture
6969
def sagemaker_session_mock():
7070
sagemaker_session_mock = Mock()
71-
sagemaker_session_mock.sagemaker_config = {}
71+
sagemaker_session_mock.sagemaker_config = None
7272
return sagemaker_session_mock
7373

7474

tests/unit/sagemaker/feature_store/test_feature_store.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333

3434
@pytest.fixture
3535
def sagemaker_session_mock():
36-
return Mock()
36+
mock = Mock()
37+
mock.sagemaker_config = None
38+
return mock
3739

3840

3941
@pytest.fixture

tests/unit/sagemaker/feature_store/test_feature_utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ def __reduce__(self):
4242
@pytest.fixture
4343
def sagemaker_session_mock():
4444
"""Fixture Mock class"""
45-
return Mock()
45+
mock = Mock()
46+
mock.sagemaker_config = None
47+
return mock
4648

4749

4850
def test_convert_unsupported_types_to_supported(sagemaker_session_mock):

tests/unit/sagemaker/lineage/test_artifact.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,12 @@ def test_create_delete_with_association(sagemaker_session):
323323
)
324324

325325

326-
def test_downstream_trials(sagemaker_session):
326+
@unittest.mock.patch("sagemaker.lineage.artifact.get_module")
327+
def test_downstream_trials(mock_get_module, sagemaker_session):
328+
# Mock smexperiments module
329+
mock_smexperiments = unittest.mock.MagicMock()
330+
mock_get_module.return_value = mock_smexperiments
331+
327332
sagemaker_session.sagemaker_client.list_associations.side_effect = [
328333
{
329334
"AssociationSummaries": [
@@ -379,7 +384,12 @@ def test_downstream_trials(sagemaker_session):
379384
assert expected_calls == sagemaker_session.sagemaker_client.list_associations.mock_calls
380385

381386

382-
def test_downstream_trials_v2(sagemaker_session):
387+
@unittest.mock.patch("sagemaker.lineage.artifact.get_module")
388+
def test_downstream_trials_v2(mock_get_module, sagemaker_session):
389+
# Mock smexperiments module
390+
mock_smexperiments = unittest.mock.MagicMock()
391+
mock_get_module.return_value = mock_smexperiments
392+
383393
sagemaker_session.sagemaker_client.query_lineage.return_value = {
384394
"Vertices": [
385395
{"Arn": "B" + str(i), "Type": "DataSet", "LineageType": "Artifact"} for i in range(10)
@@ -425,7 +435,12 @@ def test_downstream_trials_v2(sagemaker_session):
425435
assert expected_calls == sagemaker_session.sagemaker_client.query_lineage.mock_calls
426436

427437

428-
def test_upstream_trials(sagemaker_session):
438+
@unittest.mock.patch("sagemaker.lineage.artifact.get_module")
439+
def test_upstream_trials(mock_get_module, sagemaker_session):
440+
# Mock smexperiments module
441+
mock_smexperiments = unittest.mock.MagicMock()
442+
mock_get_module.return_value = mock_smexperiments
443+
429444
sagemaker_session.sagemaker_client.query_lineage.return_value = {
430445
"Vertices": [
431446
{"Arn": "B" + str(i), "Type": "DataSet", "LineageType": "Artifact"} for i in range(10)

tests/unit/sagemaker/workflow/test_callback_step.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
def sagemaker_session_mock():
2929
session_mock = Mock()
3030
session_mock.boto_session.client = Mock()
31+
session_mock.sagemaker_config = None
3132
return session_mock
3233

3334

tests/unit/test_mxnet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import pytest
2020
from mock import MagicMock, Mock, ANY
2121
from mock import patch
22-
from pkg_resources import parse_version
22+
from packaging.version import parse as parse_version
2323

2424
from sagemaker.fw_utils import UploadedCode
2525
from sagemaker.drift_check_baselines import DriftCheckBaselines

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ commands =
9494

9595
pytest {posargs}
9696
deps =
97+
setuptools<72.0.0
9798
.[test]
9899
asyncio
99100
nest_asyncio

0 commit comments

Comments
 (0)