tmetadata.py, txstat.py: use t/tmp as the tmpdir parent.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/t/tmetadata.py b/lib/bup/t/tmetadata.py
index 36c8294c4715dce6d26f7963104b09ec9871b7af..7b5d17357d1e9a96cb6b23b8c8e60ff9e15277d1 100644 (file)
--- a/lib/bup/t/tmetadata.py
+++ b/lib/bup/t/tmetadata.py
@@ -7,6 +7,7 @@ from bup.xstat import utime, lutime
 
 
 top_dir = '../../..'
+bup_tmp = os.path.realpath('../../../t/tmp')
 bup_path = top_dir + '/bup'
 start_dir = os.getcwd()
 
@@ -114,7 +115,7 @@ def test_clean_up_extract_path():
 
 @wvtest
 def test_metadata_method():
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
+    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-tmetadata-')
     try:
         bup_dir = tmpdir + '/bup'
         data_path = tmpdir + '/foo'
@@ -158,7 +159,7 @@ def _first_err():
 def test_from_path_error():
     if is_superuser() or detect_fakeroot():
         return
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
+    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-tmetadata-')
     try:
         path = tmpdir + '/foo'
         os.mkdir(path)
@@ -196,7 +197,7 @@ def test_apply_to_path_restricted_access():
         return
     if sys.platform.startswith('cygwin'):
         return # chmod 000 isn't effective.
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
+    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-tmetadata-')
     try:
         parent = tmpdir + '/foo'
         path = parent + '/bar'
@@ -224,7 +225,7 @@ def test_apply_to_path_restricted_access():
 
 @wvtest
 def test_restore_over_existing_target():
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
+    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-tmetadata-')
     try:
         path = tmpdir + '/foo'
         os.mkdir(path)

diff --git a/lib/bup/t/txstat.py b/lib/bup/t/txstat.py
index 412e71d22795954d2a4e67fb72300c9bfbad0d55..b0b51133b8c619c63e2c60010fe57879bb9a7b8f 100644 (file)
--- a/lib/bup/t/txstat.py
+++ b/lib/bup/t/txstat.py
@@ -3,6 +3,8 @@ from wvtest import *
 import bup._helpers as _helpers
 from bup import xstat
 
+bup_tmp = os.path.realpath('../../../t/tmp')
+
 @wvtest
 def test_fstime():
     WVPASSEQ(xstat.timespec_to_nsecs((0, 0)), 0)
@@ -57,7 +59,7 @@ def test_fstime():
 def test_bup_utimensat():
     if not xstat._bup_utimensat:
         return
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
+    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-txstat-')
     try:
         path = tmpdir + '/foo'
         open(path, 'w').close()
@@ -78,7 +80,7 @@ def test_bup_utimensat():
 def test_bup_utimes():
     if not xstat._bup_utimes:
         return
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
+    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-txstat-')
     try:
         path = tmpdir + '/foo'
         open(path, 'w').close()
@@ -99,7 +101,7 @@ def test_bup_utimes():
 def test_bup_lutimes():
     if not xstat._bup_lutimes:
         return
-    tmpdir = tempfile.mkdtemp(prefix='bup-tmetadata-')
+    tmpdir = tempfile.mkdtemp(dir=bup_tmp, prefix='bup-txstat-')
     try:
         path = tmpdir + '/foo'
         open(path, 'w').close()