commit bb871ba8147ead0ac3ccb999ef3689c1e0b89202
author Jenkins <jenkins@review.openstack.org> Tue Aug 01 08:16:31 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Aug 01 08:16:31 2017 +0000
tree 892a455e7434d483df7dfddc49d242d0eb071e48
parent 9740ab13ad01a9512bd1a9e5a2e596718d4770a6
parent 683f10c87a22dfdda87a3468cb59d7f8268a9c5d

Merge "Fix test_cache_hard_links when on tmpfs" into feature/zuulv3

tests/unit/test_disk_accountant.py

diff --git a/tests/unit/test_disk_accountant.py b/tests/unit/test_disk_accountant.py
index 40b3b72..db38d45 100644
--- a/tests/unit/test_disk_accountant.py
+++ b/tests/unit/test_disk_accountant.py
@@ -33,7 +33,8 @@
 
 class TestDiskAccountant(BaseTestCase):
     def test_disk_accountant(self):
-        jobs_dir = tempfile.mkdtemp()
+        jobs_dir = tempfile.mkdtemp(
+            dir=os.environ.get("ZUUL_TEST_ROOT", None))
         cache_dir = tempfile.mkdtemp()
         executor_server = FakeExecutor()
         da = DiskAccountant(jobs_dir, 1, executor_server.stopJobByJobDir,
@@ -58,7 +59,8 @@
         self.assertFalse(da.thread.is_alive())
 
     def test_cache_hard_links(self):
-        root_dir = tempfile.mkdtemp()
+        root_dir = tempfile.mkdtemp(
+            dir=os.environ.get("ZUUL_TEST_ROOT", None))
         jobs_dir = os.path.join(root_dir, 'jobs')
         os.mkdir(jobs_dir)
         cache_dir = os.path.join(root_dir, 'cache')
@@ -88,6 +90,6 @@
         try:
             self.assertEqual(set(), executor_server.stopped_jobs)
             self.assertIn(jobdir, executor_server.used)
-            self.assertEqual(1, executor_server.used[jobdir])
+            self.assertTrue(executor_server.used[jobdir] <= 1)
         finally:
             da.stop()