Changeset: 5ed3d5ad7445 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ed3d5ad7445
Removed Files:
sql/test/Users/Tests/schemaRights.stable.err
sql/test/Users/Tests/schemaRights.stable.out
Modified Files:
sql/test/Users/Tests/schemaRights.SQL.py
Branch: default
Log Message:
Cleaned up test
diffs (176 lines):
diff --git a/sql/test/Users/Tests/schemaRights.SQL.py
b/sql/test/Users/Tests/schemaRights.SQL.py
--- a/sql/test/Users/Tests/schemaRights.SQL.py
+++ b/sql/test/Users/Tests/schemaRights.SQL.py
@@ -32,40 +32,8 @@ with SQLTestCase() as tc:
DROP SCHEMA schema3;
""").assertSucceeded()
-# import os, sys
-# try:
-# from MonetDBtesting import process
-# except ImportError:
-# import process
-
-# def sql_test_client(user, passwd, input):
-# with process.client(lang="sql", user=user, passwd=passwd,
communicate=True,
-# stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE,
-# input=input, port=int(os.getenv("MAPIPORT"))) as c:
-# c.communicate()
-
-# sql_test_client('monetdb', 'monetdb', input="""\
-# CREATE USER user1 WITH PASSWORD 'user1' name 'schema test user1' schema sys;
-# CREATE USER user2 WITH PASSWORD 'user2' name 'schema test user2' schema sys;
-# GRANT sysadmin TO user1;
-# GRANT sysadmin TO user2;
-# CREATE SCHEMA schema1 AUTHORIZATION sysadmin;
-# """)
-
-
-
-# sql_test_client('user1', 'user1', input="""\
-# SET ROLE sysadmin;
-# DROP SCHEMA schema1;
-# CREATE SCHEMA schema2;
-# DROP SCHEMA schema2;
-# CREATE SCHEMA schema3;
-# """)
-
-
-# sql_test_client('user2', 'user2', input="""\
-# SET ROLE sysadmin;
-# DROP SCHEMA schema3;
-# """)
-
-
+ tc.connect(username="monetdb", password="monetdb")
+ tc.execute("""
+ DROP USER user1;
+ DROP USER user2;
+ """).assertSucceeded()
diff --git a/sql/test/Users/Tests/schemaRights.stable.err
b/sql/test/Users/Tests/schemaRights.stable.err
deleted file mode 100644
--- a/sql/test/Users/Tests/schemaRights.stable.err
+++ /dev/null
@@ -1,37 +0,0 @@
-stderr of test 'schemaRights` in directory 'sql/test/Users` itself:
-
-
-# 10:45:48 >
-# 10:45:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35479" "--set"
"mapi_usock=/var/tmp/mtest-39396/.s.monetdb.35479" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/jennie/scratch/monet-install/default/debug/var/MonetDB/mTests_sql_test_Users"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 10:45:48 >
-
-# builtin opt gdk_dbpath =
/Users/jennie/scratch/monet-install/default/debug/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35479
-# cmdline opt mapi_usock = /var/tmp/mtest-39396/.s.monetdb.35479
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/Users/jennie/scratch/monet-install/default/debug/var/MonetDB/mTests_sql_test_Users
-# cmdline opt mal_listing = 0
-# cmdline opt embedded_r = yes
-# cmdline opt gdk_debug = 536870922
-
-# 10:45:50 >
-# 10:45:50 > "/usr/local/opt/python/bin/python2.7" "schemaRights.SQL.py"
"schemaRights"
-# 10:45:50 >
-
-
-# 10:45:51 >
-# 10:45:51 > "Done."
-# 10:45:51 >
-
diff --git a/sql/test/Users/Tests/schemaRights.stable.out
b/sql/test/Users/Tests/schemaRights.stable.out
deleted file mode 100644
--- a/sql/test/Users/Tests/schemaRights.stable.out
+++ /dev/null
@@ -1,80 +0,0 @@
-stdout of test 'schemaRights` in directory 'sql/test/Users` itself:
-
-
-# 10:45:48 >
-# 10:45:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35479" "--set"
"mapi_usock=/var/tmp/mtest-39396/.s.monetdb.35479" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/jennie/scratch/monet-install/default/debug/var/MonetDB/mTests_sql_test_Users"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 10:45:48 >
-
-# MonetDB 5 server v11.22.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_Users', using 2 threads
-# Compiled for x86_64-apple-darwin14.5.0/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 4.000 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://azrael.local:35479/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-39396/.s.monetdb.35479
-# MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Finished processing logs sql/sql_logs
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 39_analytics_hge.sql
-# loading sql script: 40_geom.sql
-# loading sql script: 40_json.sql
-# loading sql script: 40_json_hge.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 46_gsl.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 72_fits.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 80_udf_hge.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 90_generator_hge.sql
-# loading sql script: 99_system.sql
-
-# 10:45:50 >
-# 10:45:50 > "/usr/local/opt/python/bin/python2.7" "schemaRights.SQL.py"
"schemaRights"
-# 10:45:50 >
-
-#CREATE USER user1 WITH PASSWORD 'user1' name 'schema test user1' schema sys;
-#CREATE USER user2 WITH PASSWORD 'user2' name 'schema test user2' schema sys;
-#GRANT sysadmin TO user1;
-#GRANT sysadmin TO user2;
-#CREATE SCHEMA schema1 AUTHORIZATION sysadmin;
-#SET ROLE sysadmin;
-#DROP SCHEMA schema1;
-#CREATE SCHEMA schema2;
-#DROP SCHEMA schema2;
-#CREATE SCHEMA schema3;
-#SET ROLE sysadmin;
-#DROP SCHEMA schema3;
-
-# 10:45:51 >
-# 10:45:51 > "Done."
-# 10:45:51 >
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
