Changeset: aa9fa22268d8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aa9fa22268d8
Modified Files:
sql/test/Users/Tests/copyinto.SQL.py
sql/test/Users/Tests/copyinto.stable.err
sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
Branch: Jun2016
Log Message:
Fix tests so that they have less changeable output.
diffs (182 lines):
diff --git a/sql/test/Users/Tests/copyinto.SQL.py
b/sql/test/Users/Tests/copyinto.SQL.py
--- a/sql/test/Users/Tests/copyinto.SQL.py
+++ b/sql/test/Users/Tests/copyinto.SQL.py
@@ -6,41 +6,41 @@ except ImportError:
TSTSRCBASE = os.environ['TSTSRCBASE']
SRCDIR = os.path.join(TSTSRCBASE, "sql", "benchmarks", "tpch")
-DATADIR = os.path.join(SRCDIR,"SF-0.01") + os.sep.replace('\\', r'\\')
+DATADIR = os.path.join(SRCDIR,"SF-0.01")
c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
-c.stdin.write("CREATE TABLE REGION ( R_REGIONKEY INTEGER NOT NULL, R_NAME
CHAR(25) NOT NULL, R_COMMENT VARCHAR(152));")
-c.stdin.write("COPY 5 RECORDS INTO region from '%s/region.tbl' USING
DELIMITERS '|', '|\n';" % DATADIR)
-c.stdin.write("select count(*) from region;");
-c.stdin.write("CREATE USER copyuser WITH PASSWORD 'copyuser' name 'copyuser'
schema sys;")
-c.stdin.write("GRANT INSERT, SELECT on region to copyuser;")
+c.stdin.write("CREATE TABLE REGION ( R_REGIONKEY INTEGER NOT NULL, R_NAME
CHAR(25) NOT NULL, R_COMMENT VARCHAR(152));\n")
+c.stdin.write("COPY 5 RECORDS INTO region from '%s' USING DELIMITERS '|',
'|\\n';\n" % os.path.join(DATADIR, 'region.tbl').replace('\\', r'\\'))
+c.stdin.write("select count(*) from region;\n")
+c.stdin.write("CREATE USER copyuser WITH PASSWORD 'copyuser' name 'copyuser'
schema sys;\n")
+c.stdin.write("GRANT INSERT, SELECT on region to copyuser;\n")
+out, err = c.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+
+c = process.client('sql', user = 'copyuser', passwd = 'copyuser', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
+c.stdin.write("COPY 5 RECORDS INTO region from '%s' USING DELIMITERS '|',
'|\\n';\n" % os.path.join(DATADIR, 'region.tbl').replace('\\', r'\\'))
+c.stdin.write("select count(*) from region;\n")
+out, err = c.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+
+c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
+c.stdin.write("GRANT COPY FROM, COPY INTO to copyuser;\n")
+out, err = c.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+
+c = process.client('sql', user = 'copyuser', passwd = 'copyuser', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
+c.stdin.write("COPY 5 RECORDS INTO region from '%s' USING DELIMITERS '|',
'|\\n';\n" % os.path.join(DATADIR, 'region.tbl').replace('\\', r'\\'))
+c.stdin.write("select count(*) from region;\n")
+out, err = c.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err.replace(DATADIR, '$DATADIR').replace('DIR\\', 'DIR/'))
+
+c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
+c.stdin.write("REVOKE COPY FROM, COPY INTO from copyuser;\n")
out, err = c.communicate()
sys.stdout.write(out)
sys.stderr.write(err)
-c = process.client('sql', user = 'copyuser', passwd = 'copyuser', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
-c.stdin.write("COPY 5 RECORDS INTO region from '%s/region.tbl' USING
DELIMITERS '|', '|\n';" % DATADIR)
-c.stdin.write("select count(*) from region;")
-out, err = c.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
-
-c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
-c.stdin.write("GRANT COPY FROM, COPY INTO to copyuser;")
-out, err = c.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
-
-c = process.client('sql', user = 'copyuser', passwd = 'copyuser', stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
-c.stdin.write("COPY 5 RECORDS INTO region from '%s/region.tbl' USING
DELIMITERS '|', '|\n';" % DATADIR)
-c.stdin.write("select count(*) from region;")
-out, err = c.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
-
-c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr
= process.PIPE)
-c.stdin.write("REVOKE COPY FROM, COPY INTO from copyuser;")
-out, err = c.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
-
diff --git a/sql/test/Users/Tests/copyinto.stable.err
b/sql/test/Users/Tests/copyinto.stable.err
--- a/sql/test/Users/Tests/copyinto.stable.err
+++ b/sql/test/Users/Tests/copyinto.stable.err
@@ -30,9 +30,8 @@ stderr of test 'copyinto` in directory '
# 19:39:23 > "/usr/bin/python2" "copyinto.SQL.py" "copyinto"
# 19:39:23 >
-MAPI = (copyuser) /var/tmp/mtest-8540/.s.monetdb.34898
-QUERY = COPY 5 RECORDS INTO region from
'/home/niels/data/rc/clean/sql/benchmarks/tpch/SF-0.01//region.tbl' USING
DELIMITERS '|', '|
- ';select count(*) from region;
+MAPI = (copyuser) /var/tmp/mtest-23128/.s.monetdb.32528
+QUERY = COPY 5 RECORDS INTO region from '$DATADIR/region.tbl' USING DELIMITERS
'|', '|\n';
ERROR = !COPY INTO: insufficient privileges: COPY INTO from file(s) requires
database administrator rights, use 'COPY INTO "region" FROM STDIN' instead
# 19:39:24 >
diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
@@ -16,21 +16,21 @@ def sql_test_client(user, passwd, input)
sql_test_client('monetdb', 'monetdb', input = """\
CREATE SCHEMA newSchema;
-select * from "sys"."users";
+select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
CREATE USER user1 with password '1' name '1st user' schema newSchema;
CREATE USER user2 with password '2' name '2nd user' schema newSchema;
CREATE USER user3 with password '3' name '3rd user' schema newSchema;
CREATE USER user4 with password '4' name '4th user' schema newSchema;
-select * from "sys"."users";
+select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
DROP USER user1;
DROP USER user2;
DROP USER user3;
DROP USER user4;
-select * from "sys"."users";
+select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
""")
diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
@@ -59,36 +59,36 @@ Ready.
# 14:28:37 >
#CREATE SCHEMA newSchema;
-#select * from "sys"."users";
-% .users, .users, .users # table_name
-% name, fullname, default_schema # name
-% varchar, varchar, int # type
-% 7, 13, 4 # length
-[ "monetdb", "MonetDB Admin", 2000 ]
+#select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
+% .u, .u, .s # table_name
+% name, fullname, name # name
+% varchar, varchar, varchar # type
+% 7, 13, 3 # length
+[ "monetdb", "MonetDB Admin", "sys" ]
#CREATE USER user1 with password '1' name '1st user' schema newSchema;
#CREATE USER user2 with password '2' name '2nd user' schema newSchema;
#CREATE USER user3 with password '3' name '3rd user' schema newSchema;
#CREATE USER user4 with password '4' name '4th user' schema newSchema;
-#select * from "sys"."users";
-% .users, .users, .users # table_name
-% name, fullname, default_schema # name
-% varchar, varchar, int # type
-% 7, 13, 4 # length
-[ "monetdb", "MonetDB Admin", 2000 ]
-[ "user1", "1st user", 8427 ]
-[ "user2", "2nd user", 8427 ]
-[ "user3", "3rd user", 8427 ]
-[ "user4", "4th user", 8427 ]
+#select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
+% .u, .u, .s # table_name
+% name, fullname, name # name
+% varchar, varchar, varchar # type
+% 7, 13, 9 # length
+[ "monetdb", "MonetDB Admin", "sys" ]
+[ "user1", "1st user", "newschema" ]
+[ "user2", "2nd user", "newschema" ]
+[ "user3", "3rd user", "newschema" ]
+[ "user4", "4th user", "newschema" ]
#DROP USER user1;
#DROP USER user2;
#DROP USER user3;
#DROP USER user4;
-#select * from "sys"."users";
-% .users, .users, .users # table_name
-% name, fullname, default_schema # name
-% varchar, varchar, int # type
-% 7, 13, 4 # length
-[ "monetdb", "MonetDB Admin", 2000 ]
+#select u.name, u.fullname, s.name from "sys"."users" u left outer join
"sys"."schemas" s on u.default_schema = s.id;
+% .u, .u, .s # table_name
+% name, fullname, name # name
+% varchar, varchar, varchar # type
+% 7, 13, 3 # length
+[ "monetdb", "MonetDB Admin", "sys" ]
# 14:28:37 >
# 14:28:37 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
