Skip to content

Commit

Permalink
Disable moto-based tests due to getmoto/moto#1589
Browse files Browse the repository at this point in the history
  • Loading branch information
forestmonster committed Feb 13, 2020
1 parent 85eaac7 commit 83d5397
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
19 changes: 10 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ def load_requirements(filename):
return [line.split()[0] for line in reqfile if not line.startswith(('#', '-'))]


def moto_broken():
"""Until https://github.com/spulec/moto/pull/1589 is resolved.
Then we will no longer need to fork moto, roll our own release, and rely either on
this hack, or the dependency_links declaration.
"""
reqts = load_requirements('dev-requirements.txt')
return reqts.append('moto==1.3.5')
# Disabled the associated tests.
#def moto_broken():
# """Until https://github.com/spulec/moto/pull/1589 is resolved.
#
# Then we will no longer need to fork moto, roll our own release, and rely either on
# this hack, or the dependency_links declaration.
# """
# reqts = load_requirements('dev-requirements.txt')
# return reqts.append('moto==1.3.5')


# Populates __version__ without importing the package
Expand All @@ -58,7 +59,7 @@ def moto_broken():
long_description=long_description,
packages=find_packages(exclude=['diffy.tests']),
include_package_data=True,
dependency_links=['git+https://github.com/forestmonster/moto.git@master#egg=moto-1.3.5'],
#dependency_links=['git+https://github.com/forestmonster/moto.git@master#egg=moto-1.3.5'],
install_requires=load_requirements('requirements.txt'),
tests_require=['pytest'],
extras_require={
Expand Down
1 change: 1 addition & 0 deletions tests/test_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ def test_analysis_list_get(client, token, status):
assert client.get(api.url_for(AnalysisList), headers=token).status_code == status


@pytest.mark.skip("Fails while moto is broken")
@pytest.mark.parametrize("token,status", [("", 400)])
def test_analysis_list_post(client, token, status, sts):
assert (
Expand Down
1 change: 1 addition & 0 deletions tests/test_baseline.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ def test_baseline_list_get(client, token, status):
assert client.get(api.url_for(BaselineList), headers=token).status_code == status


@pytest.mark.skip("Fails while moto is broken")
@pytest.mark.parametrize("token,status", [("", 400)])
def test_baseline_list_post(client, token, status, sts):
assert (
Expand Down

0 comments on commit 83d5397

Please sign in to comment.