summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-stratum-field-ordering.script
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 18:20:08 +0000
committerJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 18:23:53 +0000
commit76149b07d21ea94c627191748b35adf6ac011728 (patch)
treececa4e04e6e67399cc0e8f6fe12706391b718b9e /tests.merging/conflict-stratum-field-ordering.script
parent6dfdeea23dfc3645357a5efddc1bd3498169b2ee (diff)
downloadmorph-76149b07d21ea94c627191748b35adf6ac011728.tar.gz
tests.merging/*: 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.merging/conflict-stratum-field-ordering.script')
-rwxr-xr-xtests.merging/conflict-stratum-field-ordering.script3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script
index f5bfb4b8..00bc551a 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