Changeset: 1950dfd32e46 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1950dfd32e46
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:
Remove one more line (an empty one) if not creating SHPLoad.
diffs (96 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
@@ -76,7 +76,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
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
@@ -77,7 +77,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
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
@@ -76,7 +76,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
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
@@ -77,7 +77,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
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
@@ -76,7 +76,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
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
@@ -77,7 +77,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
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
@@ -76,7 +76,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
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
@@ -77,7 +77,7 @@ if len(sys.argv) == 2 and sys.argv[1] ==
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]
+ del stable[i-1:i+4]
break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
