Javier Jardón pushed to branch chandan/fix-pytest-get-marker at BuildStream / buildstream
Commits:
-
4b544555
by Chandan Singh at 2019-01-15T21:28:40Z
-
80fe0d9a
by Javier Jardón at 2019-01-15T22:48:22Z
-
c91784ab
by Chandan Singh at 2019-01-15T22:49:01Z
2 changed files:
Changes:
... | ... | @@ -60,6 +60,16 @@ tests-ubuntu-18.04: |
60 | 60 |
image: buildstream/testsuite-ubuntu:18.04-5da27168-32c47d1c
|
61 | 61 |
<<: *tests
|
62 | 62 |
|
63 |
+tests-python-3.7-stretch:
|
|
64 |
+ image: buildstream/testsuite-python:3.7-stretch-a60f0c39
|
|
65 |
+ <<: *tests
|
|
66 |
+ |
|
67 |
+ variables:
|
|
68 |
+ # Note that we explicitly specify TOXENV in this case because this
|
|
69 |
+ # image has both 3.6 and 3.7 versions. python3.6 cannot be removed because
|
|
70 |
+ # some of our base dependencies declare it as their runtime dependency.
|
|
71 |
+ TOXENV: py37
|
|
72 |
+ |
|
63 | 73 |
overnight-fedora-28-aarch64:
|
64 | 74 |
image: buildstream/testsuite-fedora:aarch64-28-5da27168-32c47d1c
|
65 | 75 |
tags:
|
... | ... | @@ -32,7 +32,7 @@ def pytest_addoption(parser): |
32 | 32 |
|
33 | 33 |
|
34 | 34 |
def pytest_runtest_setup(item):
|
35 |
- if item.get_marker('integration') and not item.config.getvalue('integration'):
|
|
35 |
+ if item.get_closest_marker('integration') and not item.config.getvalue('integration'):
|
|
36 | 36 |
pytest.skip('skipping integration test')
|
37 | 37 |
|
38 | 38 |
|