MonetDB: oscar - Stop databases at end of monetdb_snapshot test

[Joeri van Ruth]

Changeset: 478a276e0742 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=478a276e0742
Modified Files:
        tools/merovingian/client/Tests/monetdb_snapshot.py
        tools/merovingian/client/Tests/monetdb_snapshot.stable.err
        tools/merovingian/client/Tests/monetdb_snapshot.stable.out
        tools/merovingian/client/Tests/monetdbd.py
Branch: oscar
Log Message:

Stop databases at end of monetdb_snapshot test


diffs (68 lines):

diff --git a/tools/merovingian/client/Tests/monetdb_snapshot.py 
b/tools/merovingian/client/Tests/monetdb_snapshot.py
--- a/tools/merovingian/client/Tests/monetdb_snapshot.py
+++ b/tools/merovingian/client/Tests/monetdb_snapshot.py
@@ -12,7 +12,7 @@ from monetdbd import MonetDBD
 
 # MonetDBD.VERBOSE = True
 
-gdk_farmdir = os.environ.get('GDK_FARMDIR') or '/tmp'
+gdk_farmdir = os.environ.get('TSTTRGDIR') or '/tmp/'
 farmdir = os.path.join(gdk_farmdir, 'monetdbd-test')
 
 def header(*args, **opts):
@@ -23,7 +23,7 @@ def header(*args, **opts):
 
 header('CREATE FARM')
 
-# test that .napshotdir is not set by default
+# test that .snapshotdir is not set by default
 with MonetDBD(farmdir, set_snapdir=False) as m:
 
     header('CHECK SNAPDIR NOT SET')
@@ -93,3 +93,5 @@ with MonetDBD(farmdir, set_snapdir=False
     m.run_monetdb('snapshot', 'restore', qcustom_name, 'foo99', output=True)
     out = m.run_mclient('-s', 'select * from t', '-fcsv', output=True, 
db='foo99')
     assert out.strip() == 'foo1'
+
+    header('DONE')
diff --git a/tools/merovingian/client/Tests/monetdb_snapshot.stable.err 
b/tools/merovingian/client/Tests/monetdb_snapshot.stable.err
--- a/tools/merovingian/client/Tests/monetdb_snapshot.stable.err
+++ b/tools/merovingian/client/Tests/monetdb_snapshot.stable.err
@@ -18,6 +18,7 @@ snapshot: Snapshot target file not allow
 -   SNAPSHOT MULTI
 -   RESTORE OVER EXISTING
 -   CUSTOM FILENAME
+-   DONE
 
 # 15:32:48 >  
 # 15:32:48 >  "Done."
diff --git a/tools/merovingian/client/Tests/monetdb_snapshot.stable.out 
b/tools/merovingian/client/Tests/monetdb_snapshot.stable.out
--- a/tools/merovingian/client/Tests/monetdb_snapshot.stable.out
+++ b/tools/merovingian/client/Tests/monetdb_snapshot.stable.out
@@ -41,6 +41,11 @@ snapshotting database 'foo2'... done
 -- RESTORE OVER EXISTING
 -- CUSTOM FILENAME
 snapshotting database 'foo1'... done
+-- DONE
+stopping database 'bar'... done
+stopping database 'foo1'... done
+stopping database 'foo2'... done
+stopping database 'foo99'... done
 
 # 15:32:48 >  
 # 15:32:48 >  "Done."
diff --git a/tools/merovingian/client/Tests/monetdbd.py 
b/tools/merovingian/client/Tests/monetdbd.py
--- a/tools/merovingian/client/Tests/monetdbd.py
+++ b/tools/merovingian/client/Tests/monetdbd.py
@@ -99,8 +99,10 @@ class MonetDBD:
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if self.proc:
+            self.run_monetdb('stop', '-a')
             self.proc.terminate()
         if exc_type == None:
             # clean exit
-            self.remove_dir()
+            if not self.keep:
+                self.remove_dir()
         return False # do not suppress any exceptions
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list