diff options
| author | Luke Meyer <sosiouxme@gmail.com> | 2017-12-11 15:12:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 15:12:21 -0500 |
| commit | 14f321164380ed8d45c3e2607330c48f47296a37 (patch) | |
| tree | 9881e5238811f22c03581bc74e3b7e62fdfcc3cf | |
| parent | 35cce25b61d6bbf4cec4574923838c14d328949b (diff) | |
| parent | c7149027c8fcf766c2a3fcfc1aa1e5d5e5138b8c (diff) | |
| download | openshift-14f321164380ed8d45c3e2607330c48f47296a37.tar.gz openshift-14f321164380ed8d45c3e2607330c48f47296a37.tar.bz2 openshift-14f321164380ed8d45c3e2607330c48f47296a37.tar.xz openshift-14f321164380ed8d45c3e2607330c48f47296a37.zip | |
Merge pull request #6427 from sosiouxme/20171211-excise-integration-tests
These don't affect anything but tox and travis tests. Since those are passing, going to just merge this.
| -rw-r--r--[-rwxr-xr-x] | test/integration/build-images.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test/integration/run-tests.sh | 0 | ||||
| -rw-r--r-- | tox.ini | 3 |
3 files changed, 0 insertions, 3 deletions
diff --git a/test/integration/build-images.sh b/test/integration/build-images.sh index 74a55fa51..74a55fa51 100755..100644 --- a/test/integration/build-images.sh +++ b/test/integration/build-images.sh diff --git a/test/integration/run-tests.sh b/test/integration/run-tests.sh index 680b64602..680b64602 100755..100644 --- a/test/integration/run-tests.sh +++ b/test/integration/run-tests.sh @@ -3,7 +3,6 @@ minversion=2.3.1 envlist = py{27,35}-{flake8,pylint,unit} py27-{yamllint,ansible_syntax,generate_validation} - integration skipsdist=True skip_missing_interpreters=True @@ -14,7 +13,6 @@ deps = -rtest-requirements.txt unit: -eutils py35-flake8: flake8-bugbear==17.3.0 - integration: docker-py==1.10.6 commands = unit: pytest {posargs} @@ -23,4 +21,3 @@ commands = yamllint: python setup.py yamllint generate_validation: python setup.py generate_validation ansible_syntax: python setup.py ansible_syntax - integration: python -c 'print("run test/integration/run-tests.sh")' |