Changeset: ac8de3a1302e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac8de3a1302e
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
Branch: default
Log Message:
Also test snapshot to custom filename
diffs (75 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
@@ -2,6 +2,7 @@
import locale
import os
+import pipes
import re
import subprocess
import sys
@@ -79,7 +80,16 @@ with MonetDBD(farmdir, set_snapdir=False
print(first_words)
assert first_words == ['name', 'bar@1', 'foo1@1', '@2', 'foo2@1', '@2']
- header('RESTORE OVER')
+ header('RESTORE OVER EXISTING')
m.run_monetdb('snapshot', 'restore', '-f', 'foo2@1', 'bar', output=True)
out = m.run_mclient('-s', 'select * from t', '-fcsv', output=True,
db='bar')
- assert(out.strip() == 'foo2')
+ assert out.strip() == 'foo2'
+
+ header('CUSTOM FILENAME')
+ custom_name = os.path.join(m.snapdir, 'snap.tar')
+ qcustom_name = pipes.quote(custom_name)
+ m.run_monetdb('snapshot', 'create', '-t', qcustom_name, 'foo1')
+ assert os.path.exists(custom_name)
+ 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'
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
@@ -7,7 +7,7 @@ stderr of test 'monetdb_snapshot` in dir
- CREATE FARM
- CHECK SNAPDIR NOT SET
-- CREATE WITHOUT SNAPDIR
+- CREATE
snapshot: Snapshot target file not allowed because no 'snapshotdir' has been
configured
- SET SNAPDIR
- CREATE
@@ -16,7 +16,8 @@ snapshot: Snapshot target file not allow
- DESTROY
- CHECK
- SNAPSHOT MULTI
-- RESTORE OVER
+- RESTORE OVER EXISTING
+- CUSTOM FILENAME
# 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
@@ -20,7 +20,7 @@ operation successful
1 affected row
-- CHECK SNAPDIR NOT SET
--- CREATE WITHOUT SNAPDIR
+-- CREATE
snapshotting database 'foo1'... FAILED
-- SET SNAPDIR
-- CREATE
@@ -38,7 +38,9 @@ snapshotting database 'foo1'... done
snapshotting database 'foo2'... done
['name', 'foo1@1', 'foo2@1']
['name', 'bar@1', 'foo1@1', '@2', 'foo2@1', '@2']
--- RESTORE OVER
+-- RESTORE OVER EXISTING
+-- CUSTOM FILENAME
+snapshotting database 'foo1'... done
# 15:32:48 >
# 15:32:48 > "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
