Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use only pytest < 3 #4886

Merged
merged 3 commits into from
Oct 31, 2016
Merged

use only pytest < 3 #4886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b5d327
use only pytest < 3
atarkowska Oct 10, 2016
582c8c7
test_download: fixture IDs must be strings
joshmoore Sep 20, 2016
a80f13f
Fix other uses of ids=POLICY_FIXTURES
joshmoore Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/tools/OmeroFS/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
package_dir={"": "target"},
packages=[''],
cmdclass={'test': PyTest},
tests_require=['pytest != 3.0.0, != 3.0.1, != 3.0.2'])
tests_require=['pytest<3'])
2 changes: 1 addition & 1 deletion components/tools/OmeroPy/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@
'omero.gateway': ['pilfonts/*'],
'omero.gateway.scripts': ['imgs/*']},
cmdclass={'test': PyTest},
tests_require=['pytest != 3.0.0, != 3.0.1, != 3.0.2'])
tests_require=['pytest<3'])
4 changes: 2 additions & 2 deletions components/tools/OmeroPy/test/integration/clitest/test_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def testValidPolicy(self):
assert cfg in [x.cfg for x in self.POLICY_FIXTURES]

@pytest.mark.parametrize('fixture', POLICY_FIXTURES,
ids=POLICY_FIXTURES)
ids=[str(x) for x in POLICY_FIXTURES])
def testPolicyGlobalRestriction(self, tmpdir, fixture):
# Skip f this isn't a check for this particular
# config, then skip.
Expand All @@ -272,7 +272,7 @@ def testPolicyGlobalRestriction(self, tmpdir, fixture):
self.do_restrictions(fixture, tmpdir, group)

@pytest.mark.parametrize('fixture', POLICY_FIXTURES,
ids=POLICY_FIXTURES)
ids=[str(x) for x in POLICY_FIXTURES])
def testPolicyGroupRestriction(self, tmpdir, fixture):
parts = fixture.cfg.split(",")
config = [NV("omero.policy.binary_access", x) for x in parts]
Expand Down
2 changes: 1 addition & 1 deletion components/tools/OmeroWeb/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
packages=[''],
test_suite='test.suite',
cmdclass={'test': PyTest},
tests_require=['pytest != 3.0.0, != 3.0.1, != 3.0.2'],
tests_require=['pytest<3'],
)