From d924fa759967b7cdca0d91f21112725f6099a254 Mon Sep 17 00:00:00 2001 From: Samuel Merritt Date: Tue, 16 Jan 2018 22:19:09 -0800 Subject: [PATCH] Remove old post-as-copy leftovers from tests. Since commit 1e79f828, we don't need to test with post_as_copy=True any more since we haven't got post_as_copy at all. Change-Id: I9c96ce0b812d877bbe11bdb50eb160d6ffa5933d --- .zuul.yaml | 20 -------------------- tox.ini | 5 ----- 2 files changed, 25 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 25f624b1a3..43efe24af0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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 diff --git a/tox.ini b/tox.ini index ae770782a2..c60f497516 100644 --- a/tox.ini +++ b/tox.ini @@ -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