summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 18:18:14 +0000
committerJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 18:23:53 +0000
commit6dfdeea23dfc3645357a5efddc1bd3498169b2ee (patch)
tree8a5d8e0881e3036a1d07d6cd75a95de1cae3bcf0 /tests.branching
parent211b2a722feacb145e016b8ddb8f5f6e51339272 (diff)
downloadmorph-6dfdeea23dfc3645357a5efddc1bd3498169b2ee.tar.gz
tests.branching/*: Remove check to run only the teset with Python 2.7
As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
Diffstat (limited to 'tests.branching')
-rwxr-xr-xtests.branching/ambiguous-refs.script3
-rwxr-xr-xtests.branching/edit-updates-stratum-build-depends.script3
-rwxr-xr-xtests.branching/edit-updates-stratum.script3
-rwxr-xr-xtests.branching/petrify-no-double-petrify.script3
-rwxr-xr-xtests.branching/petrify.script3
-rwxr-xr-xtests.branching/workflow-petrify.script3
6 files changed, 0 insertions, 18 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script
index 0ea8a55f..643614ed 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 525822c9..04dbfb67 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 c2716cab..9a70d227 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 25c977b6..8d76c31b 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 6b6581d3..1b8d6421 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 b84dd977..037eafd9 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"