Changeset: 181fc03e9520 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=181fc03e9520
Added Files:
sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py
Removed Files:
sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.py
Modified Files:
sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out
Branch: Oct2014
Log Message:
Simplify test script: let Mtest start server.
diffs (90 lines):
diff --git a/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.py
b/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py
rename from sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.py
rename to sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py
--- a/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.py
+++ b/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py
@@ -4,31 +4,16 @@ try:
except ImportError:
import process
-def server_start():
- sys.stderr.write('#mserver\n')
- sys.stderr.flush()
- srv = process.server(stdin = process.PIPE,
- stdout = process.PIPE, stderr = process.PIPE)
- return srv
-
-def client(lang, user = 'monetdb', passwd = 'monetdb'):
+def main():
sys.stderr.write('#client\n')
sys.stderr.flush()
- clt = process.client(lang, user = user, passwd = passwd,
+ clt = process.client('sql', user = 'monetdb', passwd = 'monetdb',
stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
currenttime = time.strftime('%H:%M:%S', time.localtime(time.time()))
#SQL command for checking the localtime
sqlcommand = "select (localtime() - time '%s' < time '00:00:20') and (time
'%s' - localtime() < time '00:00:20');" % (currenttime, currenttime)
- return clt.communicate(sqlcommand)
-
-def main():
- srv = server_start()
- out, err = client('sql')
-
- sys.stdout.write(out)
- sys.stderr.write(err)
- out, err = srv.communicate()
+ out, err = clt.communicate(sqlcommand)
sys.stdout.write(out)
sys.stderr.write(err)
diff --git a/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out
b/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out
--- a/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out
+++ b/sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out
@@ -5,13 +5,7 @@ stdout of test 'currenttime.Bug-2781` in
# 14:00:10 > "/usr/bin/python" "currenttime.Bug-2781.py"
"currenttime.Bug-2781"
# 14:00:10 >
-#select (localtime() - time '14:00:10' < time '00:00:20') and (time '14:00:10'
- localtime() < time '00:00:20');
-% . # table_name
-% sql_sub_localtime # name
-% boolean # type
-% 5 # length
-[ true ]
-# MonetDB 5 server v11.13.6
+# MonetDB 5 server v11.19.10 (hg id: 68ab398acb08)
# This is an unreleased version
# Serving database 'mTests_test_BugTracker-2012', using 8 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
@@ -23,6 +17,9 @@ stdout of test 'currenttime.Bug-2781` in
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
# SQL catalog created, loading sql scripts once
# loading sql script: 09_like.sql
# loading sql script: 10_math.sql
@@ -47,7 +44,18 @@ stdout of test 'currenttime.Bug-2781` in
# loading sql script: 80_udf.sql
# loading sql script: 99_system.sql
-# 14:00:10 >
-# 14:00:10 > "Done."
-# 14:00:10 >
+# 09:58:27 >
+# 09:58:27 > "/usr/bin/python2" "currenttime.Bug-2781.SQL.py"
"currenttime.Bug-2781"
+# 09:58:27 >
+#select (localtime() - time '09:58:27' < time '00:00:20') and (time '09:58:27'
- localtime() < time '00:00:20');
+% .L # table_name
+% sql_sub_localtime # name
+% boolean # type
+% 5 # length
+[ true ]
+
+# 09:58:28 >
+# 09:58:28 > "Done."
+# 09:58:28 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
