MonetDB: default - Let Python read the environment, and stop ser...

[Sjoerd Mullender]

Changeset: f3cce493df24 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3cce493df24
Added Files:
        sql/test/remote/Tests/creds.SQL.py
        sql/test/remote/Tests/different_user.SQL.py
        sql/test/remote/Tests/invalid_creds.SQL.py
Removed Files:
        sql/test/remote/Tests/creds.SQL.py.in
        sql/test/remote/Tests/different_user.SQL.py.in
        sql/test/remote/Tests/invalid_creds.SQL.py.in
Branch: default
Log Message:

Let Python read the environment, and stop servers that we started.


diffs (96 lines):

diff --git a/sql/test/remote/Tests/creds.SQL.py.in 
b/sql/test/remote/Tests/creds.SQL.py
rename from sql/test/remote/Tests/creds.SQL.py.in
rename to sql/test/remote/Tests/creds.SQL.py
--- a/sql/test/remote/Tests/creds.SQL.py.in
+++ b/sql/test/remote/Tests/creds.SQL.py
@@ -93,7 +93,7 @@ supervisor_uri = "mapi:monetdb://localho
 c = supervisorconn.cursor()
 
 # Create the movies table and load the data
-movies_filename="$TSTDATAPATH/netflix_data/movies.csv"
+movies_filename=os.getenv("TSTDATAPATH")+"/netflix_data/movies.csv"
 movies_create = "CREATE TABLE movies {}".format(MOVIES_TABLE_DEF)
 c.execute(movies_create)
 load_movies = "COPY INTO movies FROM '{}' USING DELIMITERS 
',','\n','\"'".format(movies_filename)
@@ -104,7 +104,7 @@ mtable = "CREATE MERGE TABLE ratings {}"
 c.execute(mtable)
 
 # Create the workers and load the ratings data
-fn_template="$TSTDATAPATH/netflix_data/ratings_sample_{}.csv"
+fn_template=os.getenv("TSTDATAPATH")+"/netflix_data/ratings_sample_{}.csv"
 cmovies = "CREATE REMOTE TABLE movies {} ON '{}' WITH USER 'monetdb' PASSWORD 
'monetdb'".format(MOVIES_TABLE_DEF, supervisor_uri)
 workers = create_workers(fn_template, NWORKERS, cmovies, RATINGS_TABLE_DEF_FK)
 
@@ -122,3 +122,8 @@ print("{} rows in remote table".format(c
 
 c.execute("SELECT COUNT(*) FROM ratings")
 print("{} rows in merge table".format(c.fetchall()[0][0]))
+
+for wrec in workers:
+    wrec['proc'].communicate()
+
+supervisorproc.communicate()
diff --git a/sql/test/remote/Tests/different_user.SQL.py.in 
b/sql/test/remote/Tests/different_user.SQL.py
rename from sql/test/remote/Tests/different_user.SQL.py.in
rename to sql/test/remote/Tests/different_user.SQL.py
--- a/sql/test/remote/Tests/different_user.SQL.py.in
+++ b/sql/test/remote/Tests/different_user.SQL.py
@@ -101,7 +101,7 @@ c.execute("ALTER USER \"supervisor_user\
 c.execute("SET SCHEMA \"supervisor_schema\"")
 
 # Create the movies table and load the data
-movies_filename="$TSTDATAPATH/netflix_data/movies.csv"
+movies_filename=os.getenv("TSTDATAPATH")+"/netflix_data/movies.csv"
 movies_create = "CREATE TABLE movies {}".format(MOVIES_TABLE_DEF)
 c.execute(movies_create)
 load_movies = "COPY INTO movies FROM '{}' USING DELIMITERS 
',','\n','\"'".format(movies_filename)
@@ -112,7 +112,7 @@ mtable = "CREATE MERGE TABLE ratings {}"
 c.execute(mtable)
 
 # Create the workers and load the ratings data
-fn_template="$TSTDATAPATH/netflix_data/ratings_sample_{}.csv"
+fn_template=os.getenv("TSTDATAPATH")+"/netflix_data/ratings_sample_{}.csv"
 cmovies = "CREATE REMOTE TABLE movies {} ON '{}/supervisor_schema/movies' WITH 
USER 'supervisor_user' PASSWORD 'supervisor_pass'".format(MOVIES_TABLE_DEF, 
supervisor_uri)
 workers = create_workers(fn_template, NWORKERS, cmovies, RATINGS_TABLE_DEF_FK)
 
@@ -138,3 +138,8 @@ try:
 except pymonetdb.OperationalError as e2:
     print("OperationalError:", file=sys.stderr)
     print("# " + e2.message, file=sys.stderr)
+
+for wrec in workers:
+    wrec['proc'].communicate()
+
+supervisorproc.communicate()
diff --git a/sql/test/remote/Tests/invalid_creds.SQL.py.in 
b/sql/test/remote/Tests/invalid_creds.SQL.py
rename from sql/test/remote/Tests/invalid_creds.SQL.py.in
rename to sql/test/remote/Tests/invalid_creds.SQL.py
--- a/sql/test/remote/Tests/invalid_creds.SQL.py.in
+++ b/sql/test/remote/Tests/invalid_creds.SQL.py
@@ -94,7 +94,7 @@ supervisor_uri = "mapi:monetdb://localho
 c = supervisorconn.cursor()
 
 # Create the movies table and load the data
-movies_filename="$TSTDATAPATH/netflix_data/movies.csv"
+movies_filename=os.getenv("TSTDATAPATH")+"/netflix_data/movies.csv"
 movies_create = "CREATE TABLE movies {}".format(MOVIES_TABLE_DEF)
 c.execute(movies_create)
 load_movies = "COPY INTO movies FROM '{}' USING DELIMITERS 
',','\n','\"'".format(movies_filename)
@@ -105,7 +105,7 @@ mtable = "CREATE MERGE TABLE ratings {}"
 c.execute(mtable)
 
 # Create the workers and load the ratings data
-fn_template="$TSTDATAPATH/netflix_data/ratings_sample_{}.csv"
+fn_template=os.getenv("TSTDATAPATH")+"/netflix_data/ratings_sample_{}.csv"
 cmovies = "CREATE REMOTE TABLE movies {} ON '{}' WITH USER 'nonexistent' 
PASSWORD 'badpass'".format(MOVIES_TABLE_DEF, supervisor_uri)
 workers = create_workers(fn_template, NWORKERS, cmovies, RATINGS_TABLE_DEF_FK)
 
@@ -131,3 +131,8 @@ try:
 except pymonetdb.OperationalError as e2:
     print("OperationalError:", file=sys.stderr)
     print("# " + e2.message, file=sys.stderr)
+
+for wrec in workers:
+    wrec['proc'].communicate()
+
+supervisorproc.communicate()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list