Merge "Remove old post-as-copy leftovers from tests."

This commit is contained in:
Zuul 2018-01-18 09:11:27 +00:00 committed by Gerrit Code Review
commit 3e56c2d738
2 changed files with 0 additions and 25 deletions

View File

@ -58,23 +58,6 @@
parent: swift-tox-func
nodeset: centos-7
- job:
name: swift-tox-func-post-as-copy
parent: swift-tox-base
description: |
Run functional tests for swift under cPython version 2.7.
Uses tox with the ``func-post-as-copy`` environment.
It sets TMPDIR to an XFS mount point created via
tools/test-setup.sh.
vars:
tox_envlist: func-post-as-copy
- job:
name: swift-tox-func-post-as-copy-centos-7
parent: swift-tox-func-post-as-copy
nodeset: centos-7
- job:
name: swift-tox-func-encryption
parent: swift-tox-base
@ -117,7 +100,6 @@
- swift-tox-py27
- swift-tox-py35
- swift-tox-func
- swift-tox-func-post-as-copy
- swift-tox-func-encryption
- swift-tox-func-ec
gate:
@ -125,13 +107,11 @@
- swift-tox-py27
- swift-tox-py35
- swift-tox-func
- swift-tox-func-post-as-copy
- swift-tox-func-encryption
- swift-tox-func-ec
experimental:
jobs:
- swift-tox-py27-centos-7
- swift-tox-func-centos-7
- swift-tox-func-post-as-copy-centos-7
- swift-tox-func-encryption-centos-7
- swift-tox-func-ec-centos-7

View File

@ -59,11 +59,6 @@ commands =
basepython = python2.7
commands = ./.functests {posargs}
[testenv:func-post-as-copy]
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_OBJECT_POST_AS_COPY=True
[testenv:func-encryption]
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1