Skip to content

Commit bb993eb

Browse files
author
Sylvain MARIE
committed
Fixed fixture closure tests on travis by creating an 'environment' global autouse fixture
1 parent f0be3b8 commit bb993eb

4 files changed

Lines changed: 22 additions & 15 deletions

File tree

pytest_cases/tests/conftest.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
# In order to run meta-tests, see https://docs.pytest.org/en/latest/writing_plugins.html
88

99

10+
@pytest.fixture(scope='session', autouse=True)
11+
def environment():
12+
"""For some reason an 'environment' fixture appears in travis CI whil it is not present on local builds.
13+
I create one here so that fixture closures look identical"""
14+
pass
15+
16+
1017
def pytest_ignore_collect(path, config):
1118
"""
1219
In python 2, equivalent of adding

pytest_cases/tests/pytest_extension/doc/test_doc_fixture_graph_union.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ def test_closure():
5555
# make sure that the closure tree looks good
5656
global super_closure
5757
assert str(super_closure) == """SuperClosure with 3 alternative closures:
58-
- ['e', 'request', 'u', 'a', 'c', 'd'] (filters: u=u[0]=a)
59-
- ['e', 'request', 'u', 'b', 'b_ub', 'a', 'c', 'd'] (filters: u=u[1]=b, b_ub=b_ub[0]=a)
60-
- ['e', 'request', 'u', 'b', 'b_ub', 'c'] (filters: u=u[1]=b, b_ub=b_ub[1]=c)
61-
The 'super closure list' is ['e', 'request', 'u', 'a', 'c', 'd', 'b', 'b_ub']
58+
- ['environment', 'e', 'request', 'u', 'a', 'c', 'd'] (filters: u=u[0]=a)
59+
- ['environment', 'e', 'request', 'u', 'b', 'b_ub', 'a', 'c', 'd'] (filters: u=u[1]=b, b_ub=b_ub[0]=a)
60+
- ['environment', 'e', 'request', 'u', 'b', 'b_ub', 'c'] (filters: u=u[1]=b, b_ub=b_ub[1]=c)
61+
The 'super closure list' is ['environment', 'e', 'request', 'u', 'a', 'c', 'd', 'b', 'b_ub']
6262
6363
The fixture tree is :
64-
(e,request,u) split: u
64+
(environment,e,request,u) split: u
6565
- (a,c,d)
6666
- (b,b_ub) split: b_ub
6767
- (a,c,d)

pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_closure_edits.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def test_super_closure_edits2():
3333
global super_closure
3434
assert isinstance(super_closure, SuperClosure)
3535
super_closure = copy(super_closure)
36-
assert len(super_closure) == 3
37-
assert list(super_closure) == ['a', 'request', 'b']
36+
assert len(super_closure) == 4
37+
assert list(super_closure) == ['environment', 'a', 'request', 'b']
3838
reflist = list(super_closure)
3939
assert super_closure[:] == reflist[:]
4040
assert super_closure[1] == reflist[1]
@@ -45,9 +45,9 @@ def test_super_closure_edits2():
4545
super_closure[1] = reflist[1]
4646
super_closure[::2] = reflist[::2]
4747
with pytest.warns(UserWarning):
48-
super_closure[1:] = ['b', 'request']
48+
super_closure[2:] = ['b', 'request']
4949
# the above operation is allowed but does nothing and a warning is issued.
50-
assert super_closure[1:] == ['request', 'b']
50+
assert super_closure[2:] == ['request', 'b']
5151

5252
with pytest.raises(NotImplementedError):
5353
super_closure.remove('request')

pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixtures_union_2hard.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ def test_super_closure():
4343
# make sure that the closure tree looks good
4444
assert isinstance(super_closure, SuperClosure)
4545
assert str(super_closure) == """SuperClosure with 4 alternative closures:
46-
- ['c', 'a', 'request', 'd', 'b'] (filters: c=c[0]=a, d=d[0]=b)
47-
- ['c', 'a', 'request', 'd'] (filters: c=c[0]=a, d=d[1]=a)
48-
- ['c', 'b', 'request', 'a', 'd'] (filters: c=c[1]=b, d=d[0]=b)
49-
- ['c', 'b', 'request', 'a', 'd'] (filters: c=c[1]=b, d=d[1]=a)
50-
The 'super closure list' is ['c', 'a', 'request', 'd', 'b']
46+
- ['environment', 'c', 'a', 'request', 'd', 'b'] (filters: c=c[0]=a, d=d[0]=b)
47+
- ['environment', 'c', 'a', 'request', 'd'] (filters: c=c[0]=a, d=d[1]=a)
48+
- ['environment', 'c', 'b', 'request', 'a', 'd'] (filters: c=c[1]=b, d=d[0]=b)
49+
- ['environment', 'c', 'b', 'request', 'a', 'd'] (filters: c=c[1]=b, d=d[1]=a)
50+
The 'super closure list' is ['environment', 'c', 'a', 'request', 'd', 'b']
5151
5252
The fixture tree is :
53-
(c) split: c
53+
(environment,c) split: c
5454
- (a,request,d) split: d
5555
- (b)
5656
- ()

0 commit comments

Comments
 (0)