Use fixtures.TempDir directly.
Change-Id: I02e20156af20cfc019262f39e343e3ec1ce06a85 Reviewed-on: https://review.openstack.org/35541 Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
9ab86621c8
commit
5a5a95c51b
|
@ -29,7 +29,6 @@ import shutil
|
||||||
import socket
|
import socket
|
||||||
import string
|
import string
|
||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
import urllib
|
import urllib
|
||||||
|
@ -687,15 +686,14 @@ class TestScheduler(testtools.TestCase):
|
||||||
os.environ.get('OS_STDERR_CAPTURE') == '1'):
|
os.environ.get('OS_STDERR_CAPTURE') == '1'):
|
||||||
stderr = self.useFixture(fixtures.StringStream('stderr')).stream
|
stderr = self.useFixture(fixtures.StringStream('stderr')).stream
|
||||||
self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
|
self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
|
||||||
self.useFixture(fixtures.NestedTempfile())
|
|
||||||
if (os.environ.get('OS_LOG_CAPTURE') == 'True' or
|
if (os.environ.get('OS_LOG_CAPTURE') == 'True' or
|
||||||
os.environ.get('OS_LOG_CAPTURE') == '1'):
|
os.environ.get('OS_LOG_CAPTURE') == '1'):
|
||||||
self.useFixture(fixtures.FakeLogger(
|
self.useFixture(fixtures.FakeLogger(
|
||||||
level=logging.DEBUG,
|
level=logging.DEBUG,
|
||||||
format='%(asctime)s %(name)-32s '
|
format='%(asctime)s %(name)-32s '
|
||||||
'%(levelname)-8s %(message)s'))
|
'%(levelname)-8s %(message)s'))
|
||||||
tmp_root = tempfile.mkdtemp(dir=os.environ.get("ZUUL_TEST_ROOT",
|
tmp_root = self.useFixture(fixtures.TempDir(
|
||||||
'/tmp'))
|
rootdir=os.environ.get("ZUUL_TEST_ROOT"))).path
|
||||||
self.test_root = os.path.join(tmp_root, "zuul-test")
|
self.test_root = os.path.join(tmp_root, "zuul-test")
|
||||||
self.upstream_root = os.path.join(self.test_root, "upstream")
|
self.upstream_root = os.path.join(self.test_root, "upstream")
|
||||||
self.git_root = os.path.join(self.test_root, "git")
|
self.git_root = os.path.join(self.test_root, "git")
|
||||||
|
|
Loading…
Reference in New Issue