Changeset: d2f6ec9e072d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2f6ec9e072d
Modified Files:
sql/test/Tests/copy-from-lz4.py
Branch: Nov2019
Log Message:
Generate unique name to use a temporary file.
diffs (46 lines):
diff --git a/sql/test/Tests/copy-from-lz4.py b/sql/test/Tests/copy-from-lz4.py
--- a/sql/test/Tests/copy-from-lz4.py
+++ b/sql/test/Tests/copy-from-lz4.py
@@ -1,23 +1,21 @@
-import os, sys
+import os, sys, tempfile
try:
from MonetDBtesting import process
except ImportError:
import process
-def try_remove_file(): # maybe file locks would do better
- try:
- os.remove("/tmp/testing-dump.lz4")
- except:
- pass
+(fd, tmpf) = tempfile.mkstemp(suffix='.lz4', text=True)
+os.close(fd)
+os.unlink(tmpf)
+
+s = process.server(args=[], stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE)
-try_remove_file()
-
-s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+data = open(os.path.join(os.getenv('TSTSRCDIR'), 'lz4-dump.sql')).read()
-c = process.client('sql', stdin = open(os.path.join(os.getenv('TSTSRCDIR'),
'lz4-dump.sql')),
- stdout = process.PIPE, stderr = process.PIPE, log = True)
-out, err = c.communicate()
+c = process.client('sql', stdin=process.PIPE,
+ stdout=process.PIPE, stderr=process.PIPE, log=True)
+out, err = c.communicate(data.replace('/tmp/testing-dump.lz4', tmpf))
sys.stdout.write(out)
sys.stderr.write(err)
@@ -25,4 +23,7 @@ out, err = s.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
-try_remove_file()
+try:
+ os.unlink(tmpf)
+except:
+ pass
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
