diff options
| author | Joffrey F <joffrey@docker.com> | 2017-01-26 16:14:57 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2017-01-27 16:00:18 -0800 |
| commit | 847f209865cb7c9234cd19a9ae8cc9a158d9a140 (patch) | |
| tree | 50583634f742f10cf266cdb57f938fa0c446a40b /tests/helpers.py | |
| parent | 0186456f3c4d81843667cc62e2816472cbf007e0 (diff) | |
| download | docker-py-847f209865cb7c9234cd19a9ae8cc9a158d9a140.tar.gz | |
Add stop_timeout to create_container
Fix requires_api_version test decorator
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests/helpers.py')
| -rw-r--r-- | tests/helpers.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/helpers.py b/tests/helpers.py index 1e42363..b742c96 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -43,10 +43,12 @@ def untar_file(tardata, filename): def requires_api_version(version): + test_version = os.environ.get( + 'DOCKER_TEST_API_VERSION', docker.constants.DEFAULT_DOCKER_API_VERSION + ) + return pytest.mark.skipif( - docker.utils.version_lt( - docker.constants.DEFAULT_DOCKER_API_VERSION, version - ), + docker.utils.version_lt(test_version, version), reason="API version is too low (< {0})".format(version) ) |