Changeset: 64c8b4411ed4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/64c8b4411ed4
Modified Files:
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-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
Branch: default
Log Message:
Cleanup.
diffs (252 lines):
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lasthgechainrelempty.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -64,7 +64,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lastchainrelempty.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -64,7 +64,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lasthgerelempty.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -63,7 +63,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lastrelempty.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -64,7 +64,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lasthgechainrel.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -47,7 +47,7 @@ with process.server(args=['--clean-BBP']
srvout = [line for line in srvout.splitlines(keepends=True) if not
line.startswith('#')]
-# check server output (upgrade commands) and check dump (empty)
+# check server output (upgrade commands)
if len(sys.argv) == 2 and sys.argv[1] == 'upgrade':
bits = os.getenv('TST_BITS')
if bits:
@@ -65,7 +65,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -75,11 +75,6 @@ if len(sys.argv) == 2 and sys.argv[1] ==
break
with open(f) as fil:
stable = fil.readlines()
- if not os.getenv('HAVE_SHP'):
- for i in range(len(stable)):
- if 'create procedure SHPLoad' in stable[i]:
- del stable[i-1:i+4]
- break
import difflib
for line in difflib.unified_diff(stable, srvout,
fromfile='expected', tofile='received'):
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lastchainrel.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -47,7 +47,7 @@ with process.server(args=['--clean-BBP',
srvout = [line for line in srvout.splitlines(keepends=True) if not
line.startswith('#')]
-# check server output (upgrade commands) and check dump (empty)
+# check server output (upgrade commands)
if len(sys.argv) == 2 and sys.argv[1] == 'upgrade':
bits = os.getenv('TST_BITS')
if bits:
@@ -65,7 +65,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -75,11 +75,6 @@ if len(sys.argv) == 2 and sys.argv[1] ==
break
with open(f) as fil:
stable = fil.readlines()
- if not os.getenv('HAVE_SHP'):
- for i in range(len(stable)):
- if 'create procedure SHPLoad' in stable[i]:
- del stable[i-1:i+4]
- break
import difflib
for line in difflib.unified_diff(stable, srvout,
fromfile='expected', tofile='received'):
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lasthgerel.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -46,7 +46,7 @@ with process.server(mapiport='0',
srvout = [line for line in srvout.splitlines(keepends=True) if not
line.startswith('#')]
-# check server output (upgrade commands) and check dump (empty)
+# check server output (upgrade commands)
if len(sys.argv) == 2 and sys.argv[1] == 'upgrade':
bits = os.getenv('TST_BITS')
if bits:
@@ -64,7 +64,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -74,11 +74,6 @@ if len(sys.argv) == 2 and sys.argv[1] ==
break
with open(f) as fil:
stable = fil.readlines()
- if not os.getenv('HAVE_SHP'):
- for i in range(len(stable)):
- if 'create procedure SHPLoad' in stable[i]:
- del stable[i-1:i+4]
- break
import difflib
for line in difflib.unified_diff(stable, srvout,
fromfile='expected', tofile='received'):
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
@@ -18,7 +18,7 @@ dbfarm = os.environ['GDK_DBFARM']
db = os.path.join(dbfarm, os.environ['TSTDB'])
archive = os.path.join(dbfarm, 'lastrel.zip')
if not os.path.exists(archive):
- print('file "{}" not found'.format(archive), file=sys.stderr)
+ print(f'file "{archive}" not found', file=sys.stderr)
sys.exit(1)
# unpackage database
@@ -47,7 +47,7 @@ with process.server(args=['--set', 'allo
srvout = [line for line in srvout.splitlines(keepends=True) if not
line.startswith('#')]
-# check server output (upgrade commands) and check dump (empty)
+# check server output (upgrade commands)
if len(sys.argv) == 2 and sys.argv[1] == 'upgrade':
bits = os.getenv('TST_BITS')
if bits:
@@ -65,7 +65,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
for b in bits:
for a in arch:
for h in hge:
- f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ f = f'upgrade.stable.out{b}{a}{h}'
found = os.path.exists(f)
if found:
break
@@ -75,11 +75,6 @@ if len(sys.argv) == 2 and sys.argv[1] ==
break
with open(f) as fil:
stable = fil.readlines()
- if not os.getenv('HAVE_SHP'):
- for i in range(len(stable)):
- if 'create procedure SHPLoad' in stable[i]:
- del stable[i-1:i+4]
- break
import difflib
for line in difflib.unified_diff(stable, srvout,
fromfile='expected', tofile='received'):
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
