Skip to content

Commit d43b1c5

Browse files
authored
Merge pull request pytest-dev#120 from manahl/xfang-fix-pytest-profiling
pytest-profiling: fix integration tests
2 parents b852020 + 19668a7 commit d43b1c5

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
### 1.6.0 (Unreleased)
55
* pytest-server-fixtures: added previously removed TestServerV2.kill() function
6+
* pytest-profiling: pin more-itertools==5.0.0 in integration tests, as that's a PY3 only release
67

78
### 1.5.1 (2019-01-24)
89
* pytest-verbose-parametrize: fixed unicode parameters when using `@pytest.mark.parametrize`

pytest-profiling/tests/integration/test_profile_integration.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ def virtualenv():
1111
with VirtualEnv() as venv:
1212
test_dir = resource_filename('pytest_profiling',
1313
'tests/integration/profile')
14+
15+
# HACK: pin more-itertools to 5.0.0 to keep tests working in PY27 as
16+
# as that's a py3 only release
17+
venv.install_package('more-itertools==5.0.0')
18+
1419
venv.install_package('pytest-cov')
1520
venv.install_package('pytest-profiling')
1621
copy_tree(test_dir, venv.workspace)

0 commit comments

Comments
 (0)