zuul
/
zuul
Code Issues Proposed changes

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:
Monty Taylor 2013-07-03 13:39:14 -07:00 committed by Jenkins
parent 9ab86621c8
commit 5a5a95c51b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_scheduler.py
View File

@ -29,7 +29,6 @@ import shutil
import socket
import string
import subprocess
import tempfile
import threading
import time
import urllib
@ -687,15 +686,14 @@ class TestScheduler(testtools.TestCase):
os.environ.get('OS_STDERR_CAPTURE') == '1'):
stderr = self.useFixture(fixtures.StringStream('stderr')).stream
self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
self.useFixture(fixtures.NestedTempfile())
if (os.environ.get('OS_LOG_CAPTURE') == 'True' or
os.environ.get('OS_LOG_CAPTURE') == '1'):
self.useFixture(fixtures.FakeLogger(
level=logging.DEBUG,
format='%(asctime)s %(name)-32s '
'%(levelname)-8s %(message)s'))
tmp_root = tempfile.mkdtemp(dir=os.environ.get("ZUUL_TEST_ROOT",
'/tmp'))
tmp_root = self.useFixture(fixtures.TempDir(
rootdir=os.environ.get("ZUUL_TEST_ROOT"))).path
self.test_root = os.path.join(tmp_root, "zuul-test")
self.upstream_root = os.path.join(self.test_root, "upstream")
self.git_root = os.path.join(self.test_root, "git")