diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 503: Patched up failing test for 2012.03 release. Removed linaro-fetch-image from setup.py

Message ID 20120323181111.5497.85598.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

James Tunnicliffe March 23, 2012, 6:11 p.m. UTC 
------------------------------------------------------------
revno: 503
committer: James Tunnicliffe <james.tunnicliffe@linaro.org>
branch nick: linaro-image-tools
timestamp: Fri 2012-03-23 18:08:37 +0000
message:
  Patched up failing test for 2012.03 release. Removed linaro-fetch-image from setup.py
modified:
  linaro_image_tools/hwpack/tests/test_script.py
  setup.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/hwpack/tests/test_script.py'
--- linaro_image_tools/hwpack/tests/test_script.py	2011-06-17 15:22:40 +0000
+++ linaro_image_tools/hwpack/tests/test_script.py	2012-03-23 18:08:37 +0000
@@ -103,9 +103,15 @@ 
             '\n[ubuntu]\nsources-entry=%s\n' % (
                 package_name, source.sources_entry)))
         stdout, stderr = self.run_script([config.filename, "1.0"])
+        
+        # XXX Adding in the format deprecation message below is just a hack
+        # until the test can be fixed up to test a new format hwpack.
+        
         self.assertThat(
             stderr,
             DocTestMatches(
                 "Building for %(arch)s\nFetching packages\n"
+                "The format '1.0' is deprecated, please update your hardware "
+                "pack configuration.\n"
                 "Wrote hwpack_ahwpack_1.0_%(arch)s.tar.gz"
                 "\n" % dict(arch=architecture)))

=== modified file 'setup.py'
--- setup.py	2011-10-03 08:37:32 +0000
+++ setup.py	2012-03-23 18:08:37 +0000
@@ -18,6 +18,5 @@ 
             "initrd-do",
             "linaro-hwpack-create", "linaro-hwpack-install",
             "linaro-media-create", "linaro-android-media-create",
-            "linaro-hwpack-replace", "linaro-fetch-image",
-            "linaro-fetch-image-ui"],
+            "linaro-hwpack-replace"],
      )