[PATCH 5/6] tests.merging/*: Remove check to run only the teset with Python 2.7

Javier Jardón javier.jardon at codethink.co.uk
Fri Jan 18 18:30:57 GMT 2013


As we use ordererdict for python < 2.7 as well
See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
---
 tests.merging/basic.script                           | 3 ---
 tests.merging/conflict-chunks.script                 | 3 ---
 tests.merging/conflict-stratum-field-ordering.script | 3 ---
 tests.merging/move-chunk-repo.script                 | 3 ---
 tests.merging/rename-chunk.script                    | 3 ---
 tests.merging/rename-stratum.script                  | 3 ---
 6 files changed, 18 deletions(-)

diff --git a/tests.merging/basic.script b/tests.merging/basic.script
index 0dbc236..4c17452 100755
--- a/tests.merging/basic.script
+++ b/tests.merging/basic.script
@@ -21,9 +21,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script
index e5f6618..d5ed050 100755
--- a/tests.merging/conflict-chunks.script
+++ b/tests.merging/conflict-chunks.script
@@ -21,9 +21,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 . "$SRCDIR/scripts/setup-3rd-party-strata"
 
 # Create stable branch to merge TO
diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script
index f5bfb4b..00bc551 100755
--- a/tests.merging/conflict-stratum-field-ordering.script
+++ b/tests.merging/conflict-stratum-field-ordering.script
@@ -26,9 +26,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script
index 7b96bc8..6aabf30 100755
--- a/tests.merging/move-chunk-repo.script
+++ b/tests.merging/move-chunk-repo.script
@@ -21,9 +21,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 # Create system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script
index ef4c96a..a866f8a 100755
--- a/tests.merging/rename-chunk.script
+++ b/tests.merging/rename-chunk.script
@@ -21,9 +21,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 # Create system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script
index c5c9282..94bdb63 100755
--- a/tests.merging/rename-stratum.script
+++ b/tests.merging/rename-stratum.script
@@ -21,9 +21,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 # Create system branch.
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
-- 
1.8.0.2





More information about the baserock-dev mailing list