Changeset: 18da1cd9964b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18da1cd9964b
Modified Files:
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-hge/Tests/All
testing/Mtest.py.in
Branch: Jul2015
Log Message:
Refined checking for to-be-upgraded database.
diffs (67 lines):
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/All
b/sql/test/testdb-upgrade-chain-hge/Tests/All
--- a/sql/test/testdb-upgrade-chain-hge/Tests/All
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/All
@@ -1,4 +1,4 @@
-HAVE_HGE&HAVE_GEOM&PREVCHAINREL?unpackage
-HAVE_HGE&HAVE_GEOM&PREVCHAINREL?upgrade
-HAVE_HGE&HAVE_GEOM&PREVCHAINREL&RELEASERUN?package
-HAVE_HGE&HAVE_GEOM&PREVCHAINREL?dump
+HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?unpackage
+HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?upgrade
+HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL&RELEASERUN?package
+HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?dump
diff --git a/sql/test/testdb-upgrade-hge/Tests/All
b/sql/test/testdb-upgrade-hge/Tests/All
--- a/sql/test/testdb-upgrade-hge/Tests/All
+++ b/sql/test/testdb-upgrade-hge/Tests/All
@@ -1,3 +1,3 @@
-HAVE_HGE&HAVE_GEOM&PREVREL?unpackage
-HAVE_HGE&HAVE_GEOM&PREVREL?upgrade
-HAVE_HGE&HAVE_GEOM&PREVREL?dump
+HAVE_HGE&HAVE_GEOM&PREVHGEREL?unpackage
+HAVE_HGE&HAVE_GEOM&PREVHGEREL?upgrade
+HAVE_HGE&HAVE_GEOM&PREVHGEREL?dump
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1825,9 +1825,19 @@ def RunTest(env, TST, BusyPorts, COND, o
reason = "as previous release database is not
available"
elem = SkipTest(env, TST, EXT, reason, length)
break
+ elif cond == 'PREVHGEREL':
+ if not os.path.exists(os.path.join(env['GDK_DBFARM'],
'prevhgerel.zip')):
+ reason = "as previous hugeint release database is not
available"
+ elem = SkipTest(env, TST, EXT, reason, length)
+ break
elif cond == 'PREVCHAINREL':
if not os.path.exists(os.path.join(env['GDK_DBFARM'],
'prevchainrel.zip')):
- reason = "as previous release database is not
available"
+ reason = "as previous chained release database is not
available"
+ elem = SkipTest(env, TST, EXT, reason, length)
+ break
+ elif cond == 'PREVHGECHAINREL':
+ if not os.path.exists(os.path.join(env['GDK_DBFARM'],
'prevhgechainrel.zip')):
+ reason = "as previous hugeint chained release database
is not available"
elem = SkipTest(env, TST, EXT, reason, length)
break
elif not CONDITIONALS.has_key(cond):
@@ -1870,9 +1880,19 @@ def RunTest(env, TST, BusyPorts, COND, o
reason = "as previous release database is not available"
elem = SkipTest(env, TST, EXT, reason, length)
break
+ elif cond == 'PREVHGEREL':
+ if not os.path.exists(os.path.join(env['GDK_DBFARM'],
'prevhgerel.zip')):
+ reason = "as previous hugeint release database is not
available"
+ elem = SkipTest(env, TST, EXT, reason, length)
+ break
elif cond == 'PREVCHAINREL':
if not os.path.exists(os.path.join(env['GDK_DBFARM'],
'prevchainrel.zip')):
- reason = "as previous release database is not available"
+ reason = "as previous chained release database is not
available"
+ elem = SkipTest(env, TST, EXT, reason, length)
+ break
+ elif cond == 'PREVHGECHAINREL':
+ if not os.path.exists(os.path.join(env['GDK_DBFARM'],
'prevhgechainrel.zip')):
+ reason = "as previous hugeint chained release database is
not available"
elem = SkipTest(env, TST, EXT, reason, length)
break
elif not CONDITIONALS.has_key(cond):
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
