diff options
| author | Javier Jardón <javier.jardon@codethink.co.uk> | 2013-01-18 18:20:08 +0000 |
|---|---|---|
| committer | Javier Jardón <javier.jardon@codethink.co.uk> | 2013-01-18 18:23:53 +0000 |
| commit | 76149b07d21ea94c627191748b35adf6ac011728 (patch) | |
| tree | ceca4e04e6e67399cc0e8f6fe12706391b718b9e /tests.merging | |
| parent | 6dfdeea23dfc3645357a5efddc1bd3498169b2ee (diff) | |
| download | morph-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')
| -rwxr-xr-x | tests.merging/basic.script | 3 | ||||
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 3 | ||||
| -rwxr-xr-x | tests.merging/conflict-stratum-field-ordering.script | 3 | ||||
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 3 | ||||
| -rwxr-xr-x | tests.merging/rename-chunk.script | 3 | ||||
| -rwxr-xr-x | tests.merging/rename-stratum.script | 3 |
6 files changed, 0 insertions, 18 deletions
diff --git a/tests.merging/basic.script b/tests.merging/basic.script index 0dbc2367..4c174526 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 e5f6618d..d5ed0507 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 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 diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index 7b96bc81..6aabf303 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 ef4c96a2..a866f8a9 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 c5c92823..94bdb639 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 |