From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 3 Nov 2002 00:35:53 +0000 (+0000)
Subject: Fix SF # 631066, running regrtest in user mode fails
X-Git-Tag: v2.3c1~3609
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26a1eefd0f28bbdee48cd38a5c0cb9ba5ff37768;p=thirdparty%2FPython%2Fcpython.git

Fix SF # 631066, running regrtest in user mode fails

Try to write to TESTFN, if that fails, try TESTFN in /tmp
If that fails, print a warning and go on.
Will backport.
---

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index c720f433629a..8aab9de4586d 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -97,7 +97,27 @@ elif os.name != 'riscos':
             TESTFN_ENCODING="mbcs"
 else:
     TESTFN = 'test'
-del os
+
+# Make sure we can write to TESTFN, try in /tmp if we can't
+fp = None
+try:
+    fp = open(TESTFN, 'w+')
+except IOError:
+    TMP_TESTFN = os.path.join('/tmp', TESTFN)
+    try:
+        fp = open(TMP_TESTFN, 'w+')
+        TESTFN = TMP_TESTFN
+        del TMP_TESTFN
+    except IOError:
+        print ('WARNING: tests will fail, unable to write to: %s or %s' % 
+                (TESTFN, TMP_TESTFN))
+if fp is not None:
+    fp.close()
+    try:
+        os.unlink(TESTFN)
+    except:
+        pass
+del os, fp
 
 from os import unlink