Changeset: a80e59628662 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a80e59628662
Modified Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
sql/test/emptydb-previous-upgrade/Tests/upgrade.py
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
sql/test/emptydb-upgrade-chain/Tests/upgrade.py
sql/test/emptydb-upgrade-hge/Tests/upgrade.py
sql/test/emptydb-upgrade/Tests/upgrade.py
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
sql/test/testdb-previous-upgrade/Tests/upgrade.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-upgrade-chain/Tests/upgrade.py
sql/test/testdb-upgrade-hge/Tests/upgrade.py
sql/test/testdb-upgrade/Tests/upgrade.py
testing/Mtest.py.in
testing/process.py
Branch: Sep2022
Log Message:
Use vaultkey during testing.
diffs (truncated from 321 to 300 lines):
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.py
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.py
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.py
b/sql/test/emptydb-upgrade/Tests/upgrade.py
--- a/sql/test/emptydb-upgrade/Tests/upgrade.py
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.py
b/sql/test/testdb-previous-upgrade/Tests/upgrade.py
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.py
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.py
b/sql/test/testdb-upgrade-hge/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.py
b/sql/test/testdb-upgrade/Tests/upgrade.py
--- a/sql/test/testdb-upgrade/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade/Tests/upgrade.py
@@ -22,6 +22,10 @@ if not os.path.exists(archive):
sys.exit(1)
# unpackage database
+try:
+ os.remove(os.path.join(db, '.vaultkey'))
+except FileNotFoundError:
+ pass
with zipfile.ZipFile(archive) as z:
z.extractall(path=db)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -25,7 +25,7 @@ import os
import sys
import shutil
import re
-import random
+import secrets
import time
import socket
import struct
@@ -347,8 +347,6 @@ import argparse
import threading
-randomPortRepeat = 9
-
(F_SKIP, F_OK, F_WARN, F_SOCK, F_ERROR, F_TIME, F_ABRT, F_RECU, F_SEGV) =
range(9)
FAILURES = {
@@ -608,8 +606,6 @@ stylesheet = Element('style', None, Text
TIMES = []
-random.seed(time.time())
-
#TODO:
#class TimeoutError:
# def __init__(self, text):
@@ -1315,6 +1311,7 @@ def PerformDir(env, testdir, testlist, t
#TODO:
# add "something" to HTML output
return td, elem, max(FdOut, FdErr), interrupted,
test_progress
+ keyfile = os.path.join(LogDBdir, '.vaultkey')
if os.path.isabs(LogDBdir) and not os.path.exists(LogDBdir):
try:
os.makedirs(LogDBdir)
@@ -1323,6 +1320,12 @@ def PerformDir(env, testdir, testlist, t
#TODO:
# add "something" to HTML output
return td, elem, max(FdOut, FdErr), interrupted,
test_progress
+ else:
+ if not initdb:
+ vaultkey = secrets.token_urlsafe(32).encode('ascii')
+ with open(keyfile, 'wb') as vault:
+ vault.write(vaultkey)
+ vault.write(b'\0' * (48 - len(vaultkey)))
if initdb:
import zipfile
try:
@@ -1342,8 +1345,12 @@ def PerformDir(env, testdir, testlist, t
# add "something" to HTML output
return td, elem, max(FdOut, FdErr), interrupted,
test_progress
z.close()
+ if os.path.exists(keyfile):
+ vaultopt = ['--set', 'monet_vault_key={}'.format(keyfile)]
+ else:
+ vaultopt = []
if not oneserver:
- pSrvr =
ServerClass(splitcommand(env['exe']['mserver5'][1]) + ['--dbpath=%s' %
LogDBdir] + mserver5_opts, open(os.devnull, 'w'), open(os.devnull, 'w'),
par['TIMEOUT'], os.path.join(LogDBdir, '.started'))
+ pSrvr =
ServerClass(splitcommand(env['exe']['mserver5'][1]) + ['--dbpath=%s' %
LogDBdir] + vaultopt + mserver5_opts, open(os.devnull, 'w'), open(os.devnull,
'w'), par['TIMEOUT'], os.path.join(LogDBdir, '.started'))
pSrvr.LaunchIt()
pSrvr.terminate()
if not os.path.exists(TSTTRGDIR):
@@ -1375,6 +1382,8 @@ def PerformDir(env, testdir, testlist, t
else:
cmd = splitcommand(env['exe']['mserver5'][1]) +
['--dbpath=%s' % LogDBdir] + mserver5_opts + options
pollfile = os.path.join(LogDBdir, '.started')
+ if os.path.exists(keyfile):
+ cmd.extend(['--set',
'monet_vault_key={}'.format(keyfile)])
if env.get('MULTIFARM'):
cmd.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
shutil.rmtree(os.path.join(env['GDK_DBFARM'], TSTPREF
+ '_transient'),
@@ -2796,6 +2805,9 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
break
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
