Changeset: b3f1a44993d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3f1a44993d4
Modified Files:
sql/test/testdb-upgrade-chain/Tests/package.py
sql/test/testdb/Tests/testdb-package.py
Branch: Oct2014
Log Message:
Search for BBP.dir in the same way the GDK does on startup.
diffs (36 lines):
diff --git a/sql/test/testdb-upgrade-chain/Tests/package.py
b/sql/test/testdb-upgrade-chain/Tests/package.py
--- a/sql/test/testdb-upgrade-chain/Tests/package.py
+++ b/sql/test/testdb-upgrade-chain/Tests/package.py
@@ -9,7 +9,13 @@ if not os.path.exists(db):
print >> sys.stderr, 'database directory %s does not exist' % db
sys.exit(1)
-f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'rU')
+try:
+ f = open(os.path.join(db, 'bat', 'BACKUP', 'SUBCOMMIT', 'BBP.dir'), 'rU')
+except IOError:
+ try:
+ f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'rU')
+ except IOError:
+ f = open(os.path.join(db, 'bat', 'BBP.dir'), 'rU')
hdr = f.readline()
ptroid = f.readline()
ptr, oid = ptroid.split()
diff --git a/sql/test/testdb/Tests/testdb-package.py
b/sql/test/testdb/Tests/testdb-package.py
--- a/sql/test/testdb/Tests/testdb-package.py
+++ b/sql/test/testdb/Tests/testdb-package.py
@@ -8,7 +8,13 @@ if not os.path.exists(db):
print >> sys.stderr, 'database directory %s does not exist' % db
sys.exit(1)
-f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'rU')
+try:
+ f = open(os.path.join(db, 'bat', 'BACKUP', 'SUBCOMMIT', 'BBP.dir'), 'rU')
+except IOError:
+ try:
+ f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'rU')
+ except IOError:
+ f = open(os.path.join(db, 'bat', 'BBP.dir'), 'rU')
hdr = f.readline()
ptroid = f.readline()
ptr, oid = ptroid.split()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
