[PATCH 4/6] tests.branching/*: 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:56 GMT 2013


As we use ordererdict for python < 2.7 as well
See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
---
 tests.branching/ambiguous-refs.script                     | 3 ---
 tests.branching/edit-updates-stratum-build-depends.script | 3 ---
 tests.branching/edit-updates-stratum.script               | 3 ---
 tests.branching/petrify-no-double-petrify.script          | 3 ---
 tests.branching/petrify.script                            | 3 ---
 tests.branching/workflow-petrify.script                   | 3 ---
 6 files changed, 18 deletions(-)

diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script
index 0ea8a55..643614e 100755
--- a/tests.branching/ambiguous-refs.script
+++ b/tests.branching/ambiguous-refs.script
@@ -23,9 +23,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 . "$SRCDIR/scripts/fix-committer-info"
 
 cd "$DATADIR/morphs"
diff --git a/tests.branching/edit-updates-stratum-build-depends.script b/tests.branching/edit-updates-stratum-build-depends.script
index 525822c..04dbfb6 100755
--- a/tests.branching/edit-updates-stratum-build-depends.script
+++ b/tests.branching/edit-updates-stratum-build-depends.script
@@ -20,9 +20,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 # Add a second stratum that build-depends on the first. We can ignore the fact
 # that both strata contain the same chunk for this test.
 cd "$DATADIR/morphs"
diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script
index c2716ca..9a70d22 100755
--- a/tests.branching/edit-updates-stratum.script
+++ b/tests.branching/edit-updates-stratum.script
@@ -20,9 +20,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.branching/petrify-no-double-petrify.script b/tests.branching/petrify-no-double-petrify.script
index 25c977b..8d76c31 100755
--- a/tests.branching/petrify-no-double-petrify.script
+++ b/tests.branching/petrify-no-double-petrify.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
 "$SRCDIR/scripts/test-morph" branch test:morphs test/petrify
diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script
index 6b6581d..1b8d642 100755
--- a/tests.branching/petrify.script
+++ b/tests.branching/petrify.script
@@ -21,9 +21,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 . "$SRCDIR/tests.branching/setup-second-chunk"
 
 cd "$DATADIR/workspace"
diff --git a/tests.branching/workflow-petrify.script b/tests.branching/workflow-petrify.script
index b84dd97..037eafd 100755
--- a/tests.branching/workflow-petrify.script
+++ b/tests.branching/workflow-petrify.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"
 
 cd "$DATADIR/workspace"
-- 
1.8.0.2





More information about the baserock-dev mailing list