Changeset: 2804fcd91985 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2804fcd91985
Modified Files:
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
Branch: default
Log Message:
Fix upgrade test for when SHP (GDAL) is not available.
diffs (116 lines):
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
@@ -75,8 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
stable = open(f).readlines()
if not os.getenv('HAVE_SHP'):
for i in range(len(stable)):
- if 'SHPattach' in stable[i]:
- del stable[i-1:i+5]
+ if 'create procedure SHPLoad' in stable[i]:
+ del stable[i-1:i+3]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
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
@@ -75,8 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
stable = open(f).readlines()
if not os.getenv('HAVE_SHP'):
for i in range(len(stable)):
- if 'SHPattach' in stable[i]:
- del stable[i-1:i+5]
+ if 'create procedure SHPLoad' in stable[i]:
+ del stable[i-1:i+3]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
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
@@ -73,6 +73,11 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if found:
break
stable = open(f).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+3]
+ break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
sys.stderr.write(line)
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
@@ -73,6 +73,11 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if found:
break
stable = open(f).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+3]
+ break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
sys.stderr.write(line)
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
@@ -75,8 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
stable = open(f).readlines()
if not os.getenv('HAVE_SHP'):
for i in range(len(stable)):
- if 'SHPattach' in stable[i]:
- del stable[i-1:i+5]
+ if 'create procedure SHPLoad' in stable[i]:
+ del stable[i-1:i+3]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
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
@@ -75,8 +75,8 @@ if len(sys.argv) == 2 and sys.argv[1] ==
stable = open(f).readlines()
if not os.getenv('HAVE_SHP'):
for i in range(len(stable)):
- if 'SHPattach' in stable[i]:
- del stable[i-1:i+5]
+ if 'create procedure SHPLoad' in stable[i]:
+ del stable[i-1:i+3]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
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
@@ -73,6 +73,11 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if found:
break
stable = open(f).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+3]
+ break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
sys.stderr.write(line)
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
@@ -73,6 +73,11 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if found:
break
stable = open(f).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+3]
+ break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
sys.stderr.write(line)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
