[PATCH 3/6] tests.as-root/*: 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:55 GMT 2013


As we use ordererdict for python < 2.7 as well
See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
---
 tests.as-root/build-handles-stratum-build-depends.script               | 3 ---
 tests.as-root/build-with-external-strata.script                        | 3 ---
 tests.as-root/build-with-push.script                                   | 3 ---
 ...a-system-branch-multiple-times-doesnt-generate-new-artifacts.script | 3 ---
 .../building-a-system-branch-picks-up-uncommitted-changes.script       | 3 ---
 tests.as-root/building-a-system-branch-works-anywhere.script           | 3 ---
 tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script           | 2 --
 tests.as-root/tarball-image-is-sensible.script                         | 2 --
 .../unimportant-morphology-contents-do-not-change-cache-keys.script    | 3 ---
 9 files changed, 25 deletions(-)

diff --git a/tests.as-root/build-handles-stratum-build-depends.script b/tests.as-root/build-handles-stratum-build-depends.script
index 5df90bf..c99c2c0 100755
--- a/tests.as-root/build-handles-stratum-build-depends.script
+++ b/tests.as-root/build-handles-stratum-build-depends.script
@@ -18,9 +18,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 . "$SRCDIR/tests.as-root/setup-build"
 
 cd "$DATADIR/workspace"
diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script
index c3d84ec..0b5b8a9 100755
--- a/tests.as-root/build-with-external-strata.script
+++ b/tests.as-root/build-with-external-strata.script
@@ -19,9 +19,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"
diff --git a/tests.as-root/build-with-push.script b/tests.as-root/build-with-push.script
index 554edaa..cda47be 100755
--- a/tests.as-root/build-with-push.script
+++ b/tests.as-root/build-with-push.script
@@ -19,9 +19,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-source "$SRCDIR/scripts/python-check"
-
 source "$SRCDIR/tests.as-root/setup-build"
 
 cd "$DATADIR/workspace/branch1"
diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script
index 7b26e84..3a4d5cf 100755
--- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script
+++ b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script
@@ -20,9 +20,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-source "$SRCDIR/scripts/python-check"
-
 source "$SRCDIR/tests.as-root/setup-build"
 
 # Build once.
diff --git a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script
index 7368273..99bc576 100755
--- a/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script
+++ b/tests.as-root/building-a-system-branch-picks-up-uncommitted-changes.script
@@ -20,9 +20,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-source "$SRCDIR/scripts/python-check"
-
 source "$SRCDIR/tests.as-root/setup-build"
 
 # Build the linux system from the system branch.
diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script
index 3f96e00..3aafb15 100755
--- a/tests.as-root/building-a-system-branch-works-anywhere.script
+++ b/tests.as-root/building-a-system-branch-works-anywhere.script
@@ -21,9 +21,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-source "$SRCDIR/scripts/python-check"
-
 source "$SRCDIR/tests.as-root/setup-build"
 
 # Build from the workspace root.
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index 8bf25de..714fe72 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -21,8 +21,6 @@
 
 set -eu
 
-. "$SRCDIR/scripts/python-check"
-
 cache="$DATADIR/cache/artifacts"
 
 arch=$(uname -m)
diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script
index 4651025..1338a39 100755
--- a/tests.as-root/tarball-image-is-sensible.script
+++ b/tests.as-root/tarball-image-is-sensible.script
@@ -21,8 +21,6 @@
 
 set -eu
 
-. "$SRCDIR/scripts/python-check"
-
 . "$SRCDIR/scripts/fix-committer-info"
 
 tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
diff --git a/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script b/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script
index 27adf8c..e30d7d0 100755
--- a/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script
+++ b/tests.as-root/unimportant-morphology-contents-do-not-change-cache-keys.script
@@ -23,9 +23,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-source "$SRCDIR/scripts/python-check"
-
 source "$SRCDIR/tests.as-root/setup-build"
 
 # Build once.
-- 
1.8.0.2





More information about the baserock-dev mailing list