Changeset: ae2bce394648 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae2bce394648
Modified Files:
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade/Tests/dump.SQL.py
sql/test/testdb/Tests/testdb-dump.SQL.py
Branch: Dec2016
Log Message:
Don't make Python do output processing.
This saves about 100 seconds for each of the tests on my machine.
diffs (95 lines):
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
@@ -5,13 +5,5 @@ try:
except ImportError:
import process
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
@@ -5,13 +5,6 @@ try:
except ImportError:
import process
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
+p = process.client('sqldump')
+p.communicate()
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
@@ -5,13 +5,5 @@ try:
except ImportError:
import process
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
diff --git a/sql/test/testdb-upgrade/Tests/dump.SQL.py
b/sql/test/testdb-upgrade/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade/Tests/dump.SQL.py
@@ -5,13 +5,5 @@ try:
except ImportError:
import process
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
diff --git a/sql/test/testdb/Tests/testdb-dump.SQL.py
b/sql/test/testdb/Tests/testdb-dump.SQL.py
--- a/sql/test/testdb/Tests/testdb-dump.SQL.py
+++ b/sql/test/testdb/Tests/testdb-dump.SQL.py
@@ -6,13 +6,5 @@ except ImportError:
import process
sys.stdout.flush() # just to be sure
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
- sys.stdout.write(out[pos:res.start(0)])
- sys.stdout.write('%.8g' % float(res.group(0)))
- pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
