Merge lp:~cjohnston/uci-engine/amulet-int-test-fix into lp:uci-engine

[Chris Johnston]

Fixes integration amulet tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:461
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/580/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/580/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:465
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/582/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/582/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:466
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/583/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/583/rebuild

review: Approve (continuous-integration)

[Celso Providelo (cprov)]

Nice move exposing TestCaseWithGnupg() to other test suites! I needed it in GK and had to do an ugly importing dancing.

I think it would be even better if instead of importing ci_utils.tests in callsites (and possibly dealing with name conflicts as you did) we create a ci_utils.testing domain for storing common auxiliary testing tools for UCI-E.

Just a suggestion, though. It's not a big deal to handle namespace clashing here and there, but it might get annoying when we start grouping common testing tools more aggressively.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:467
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/584/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/584/rebuild

review: Approve (continuous-integration)

[Vincent Ladeuil (vila)]

> Nice move exposing TestCaseWithGnupg() to other test suites! I needed it in GK
> and had to do an ugly importing dancing.
>
> I think it would be even better if instead of importing ci_utils.tests in
> callsites (and possibly dealing with name conflicts as you did) we create a
> ci_utils.testing domain for storing common auxiliary testing tools for UCI-E.

Objection your honor !

You're kicking the can, the next time we'll have two 'testing' modules and we'll have to deal with the namespace clashing anyway.

This class is part of the test infrastructure and as such, perfectly fine under (or in) the 'tests' module/hierarchy.

> Just a suggestion, though. It's not a big deal to handle namespace clashing
> here and there, but it might get annoying when we start grouping common
> testing tools more aggressively.

This will happen naturally as needed and we'll deal with the conflicts as needed. It's common to define a test class in a lower module and move it up as it's reused. Here we crossing the component boundary but it's still a test class.

[Celso Providelo (cprov)]

On Tue, May 6, 2014 at 3:50 AM, Vincent Ladeuil <email address hidden> wrote:
>> Nice move exposing TestCaseWithGnupg() to other test suites! I needed it in GK
>> and had to do an ugly importing dancing.
>>
>> I think it would be even better if instead of importing ci_utils.tests in
>> callsites (and possibly dealing with name conflicts as you did) we create a
>> ci_utils.testing domain for storing common auxiliary testing tools for UCI-E.
>
> Objection your honor !
>
> You're kicking the can, the next time we'll have two 'testing' modules and we'll have to deal with the namespace clashing anyway.
>
> This class is part of the test infrastructure and as such, perfectly fine under (or in) the 'tests' module/hierarchy.

Vincent,

You are obviously misunderstanding the purpose of a ci_utils.testing
submodule. It will hold tests helpers that are common to be project in
the module domain, ci_utils.tests is meant to contain context-relevant
tests not code.

>> Just a suggestion, though. It's not a big deal to handle namespace clashing
>> here and there, but it might get annoying when we start grouping common
>> testing tools more aggressively.
>
> This will happen naturally as needed and we'll deal with the conflicts as needed. It's common to define a test class in a lower module and move it up as it's reused. Here we crossing the component boundary but it's still a test class.

That's the point, testing helpers are not tests, they are helpers and
when they become needed/useful in other context they need to go up to
a shared-place which is the module domain, not the tests folder.

Let's sort this on IRC.

[]

--
Celso Providelo
<email address hidden>

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:469
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/600/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/600/rebuild

review: Approve (continuous-integration)

[Vincent Ladeuil (vila)]

13 +def get_test_file_path(filename):

Thanks ! I think it indeed makes more sense to have that as a module
function rather than a test class method.

I've made further cleanups in lp:~vila/uci-engine/amulet-int-test-fix as
revno 470.

141 + old_path = sys.path
142 + sys.path = []
143 + with self.assertRaises(SystemExit):
144 + deploy.check_dependencies(needed_imports=['gnupg'])
145 + sys.path = old_path

If the test fails, sys.path won't be restored, bad things will happen ;)

Fixed in revno 471.

73 +def check_dependencies(needed_commands='', needed_imports=''):

Good addition, thanks for the added test !

None is a better default value, [] can't be used and adding if needed_imports
is None: needed_imports = [] seems like overkill here.

Fixed in revno 472.

191 + if and_ip:
192 + return units, ip
193 + else:
194 + return ip

Variable signature depending on input args, urgh, I don't think we need it here, if you want to ignore the port, just take the ip.

Fixed in revno 473.

Back to:

138 + def test_check_dependencies_needed_imports(self):
144 + deploy.check_dependencies(needed_imports=['gnupg'])

If gnupg is already imported, this test will (and has in my case ;) fail, so
better check for a non existing module instead.

Fixed in revno 474.

Overall, this MP was about s/ts-django/webui-apache/, with all those cleanups this is going out of hand, so let's try to land it asap as I agree the core fix should help.

review: Needs Fixing

[Vincent Ladeuil (vila)]

Good for me !

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:471
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/603/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/603/rebuild

review: Approve (continuous-integration)

[Ubuntu CI Bot (uci-bot)]

Attempt to merge into lp:uci-engine failed due to conflicts:

text conflict in juju-deployer/test_deploy.py

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:472
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/605/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/605/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cjohnston/uci-engine/amulet-int-test-fix]

473. By Chris Johnston on 2014-05-07

Fix conflicts - from cprov

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:473
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/607/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/607/rebuild

review: Approve (continuous-integration)

=== modified file 'ci-utils/ci_utils/testing/__init__.py'
--- ci-utils/ci_utils/testing/__init__.py	2014-05-06 14:52:19 +0000
+++ ci-utils/ci_utils/testing/__init__.py	2014-05-07 16:48:40 +0000
@@ -70,6 +70,7 @@
     def _destroy_gnupg_env(self):
         shutil.rmtree(self.gnupg_home)
 
-    def get_test_file_path(self, filename):
-        """Return the absolute path of a given testing file."""
-        return os.path.join(TEST_DATA_ROOT, filename)
+
+def get_test_file_path(filename):
+    """Return the absolute path of a given testing file."""
+    return os.path.join(TEST_DATA_ROOT, filename)

=== modified file 'ci-utils/ci_utils/testing/features.py'
--- ci-utils/ci_utils/testing/features.py	2014-05-06 14:16:05 +0000
+++ ci-utils/ci_utils/testing/features.py	2014-05-07 16:48:40 +0000
@@ -21,7 +21,6 @@
 from ucitests import features
 import yaml
 
-
 # Provide a shorcut so users don't have to import from ucitests
 requires = features.requires
 

=== modified file 'ci-utils/ci_utils/tests/test_file_handler.py'
--- ci-utils/ci_utils/tests/test_file_handler.py	2014-05-06 16:53:31 +0000
+++ ci-utils/ci_utils/tests/test_file_handler.py	2014-05-07 16:48:40 +0000
@@ -27,13 +27,11 @@
     FileToUploadNotFound,
     UploadDirNotFound
 )
-from ci_utils.testing import (
-    TestCaseWithGnupg,
-    TEST_DATA_ROOT,
-)
-
-
-class ChangesProcessorTestCase(TestCaseWithGnupg):
+from ci_utils import testing
+
+
+class ChangesProcessorTestCase(testing.TestCaseWithGnupg):
+
     def setUp(self):
         super(ChangesProcessorTestCase, self).setUp()
         self.create_test_info()
@@ -58,8 +56,8 @@
                                                 self.source_version)
 
     def test_parse(self):
-        processor = ChangesProcessor(self.get_test_file_path(
-                                     self.changes_file))
+        tf_path = testing.get_test_file_path
+        processor = ChangesProcessor(tf_path(self.changes_file))
         processor.parse()
         self.assertIsInstance(processor.changes, Changes)
         self.assertEqual(processor.changes.get_package_name(),
@@ -68,87 +66,90 @@
         self.assertEqual(processor.source_package_name, self.source_name)
         self.assertEqual(processor.source_version, self.full_version)
 
-        self.assertEqual(self.get_test_file_path(self.dsc_file),
-                         processor.changes.get_dsc())
-        self.assertEqual(self.get_test_file_path(self.debian_tar_gz_file),
+        self.assertEqual(tf_path(self.dsc_file), processor.changes.get_dsc())
+        self.assertEqual(tf_path(self.debian_tar_gz_file),
                          processor.changes.get_diff())
-        self.assertTrue(self.get_test_file_path(self.orig_file) in
-                        processor.changes.get_files())
+        self.assertTrue(tf_path(self.orig_file)
+                        in processor.changes.get_files())
 
     def test_parse_changes_file_not_found(self):
-        self.assertRaises(ChangesFileNotFound, ChangesProcessor,
-                          "barbaz_source.changes")
+        with self.assertRaises(ChangesFileNotFound):
+            ChangesProcessor("barbaz_source.changes")
 
     def test_parse_changes_file_is_a_dsc(self):
         # We're only able to tell a file is a real .changes during parsing.
         processor = ChangesProcessor(
-            self.get_test_file_path("foobar_0.1-1_dsc.changes"))
-        self.assertRaises(ChangesParseError, processor.parse)
+            testing.get_test_file_path("foobar_0.1-1_dsc.changes"))
+        with self.assertRaises(ChangesParseError):
+            processor.parse()
 
     def test_parse_changes_file_is_something_else(self):
         # We're only able to tell a file is a real .changes during parsing.
         processor = ChangesProcessor(
-            self.get_test_file_path("foobar_0.1-1_random.changes"))
-        self.assertRaises(ChangesFileException, processor.parse)
+            testing.get_test_file_path("foobar_0.1-1_random.changes"))
+        with self.assertRaises(ChangesFileException):
+            processor.parse()
 
     def test_upload_dir_not_found(self):
-        self.assertRaises(UploadDirNotFound, ChangesProcessor,
-                          self.get_test_file_path(self.changes_file),
-                          "foo/bar/baz")
+        with self.assertRaises(UploadDirNotFound):
+            ChangesProcessor(testing.get_test_file_path(self.changes_file),
+                             "foo/bar/baz")
 
     def test_files_to_upload_dir_found(self):
         processor = ChangesProcessor(
-            self.get_test_file_path(self.changes_file),
-            files_to_upload_dir=TEST_DATA_ROOT)
-        self.assertEquals(processor.files_to_upload_dir, TEST_DATA_ROOT)
+            testing.get_test_file_path(self.changes_file),
+            files_to_upload_dir=testing.TEST_DATA_ROOT)
+        self.assertEquals(testing.TEST_DATA_ROOT,
+                          processor.files_to_upload_dir)
 
     def test_file_to_upload_not_found(self):
         processor = ChangesProcessor(
-            self.get_test_file_path(self.changes_file),
-            files_to_upload_dir=".")
+            testing.get_test_file_path(self.changes_file),
+            files_to_upload_dir="/tmp")
         self.assertRaises(FileToUploadNotFound, processor.parse)
 
     def test_all_files_found(self):
         processor = ChangesProcessor(
-            self.get_test_file_path(self.changes_file))
-        self.assertEqual(len(processor.files_to_upload), 0)
+            testing.get_test_file_path(self.changes_file))
+        self.assertEqual(0, len(processor.files_to_upload))
         processor.parse()
         # The three files (dsc, debian.tar.gz and orig) plus changes file
-        self.assertEqual(len(processor.files_to_upload), 4)
+        self.assertEqual(4, len(processor.files_to_upload))
         processor.validate()
         self.assertTrue(
             processor.changes.get_dsc() in processor.files_to_upload)
         self.assertTrue(
             processor.changes.get_diff() in processor.files_to_upload)
         self.assertTrue(
-            self.get_test_file_path(self.orig_file) in
+            testing.get_test_file_path(self.orig_file) in
             processor.files_to_upload)
 
     def test_files_to_upload_dir_not_provided(self):
         processor = ChangesProcessor(
-            self.get_test_file_path(self.changes_file))
-        self.assertEqual(processor.files_to_upload_dir, TEST_DATA_ROOT)
+            testing.get_test_file_path(self.changes_file))
+        self.assertEqual(testing.TEST_DATA_ROOT, processor.files_to_upload_dir)
 
     def test_signature_check_fails(self):
         processor = ChangesProcessor(
-            self.get_test_file_path("foobar_0.1-1_unsigned.changes"))
+            testing.get_test_file_path("foobar_0.1-1_unsigned.changes"))
         processor.parse()
         self.assertRaises(ChangesValidationError, processor.validate)
 
     def test_validate_distribution_unreleased(self):
         processor = ChangesProcessor(
-            self.get_test_file_path("foobar_0.1-1_unreleased.changes"))
+            testing.get_test_file_path("foobar_0.1-1_unreleased.changes"))
         processor.parse()
-        self.assertRaises(ChangesValidationError, processor.validate)
+        with self.assertRaises(ChangesValidationError):
+            processor.validate()
 
     def test_process(self):
         # Simple test to guarantee minimum integrity of this method, as the
         # parts are being tested elsewhere.
         processor = ChangesProcessor(
-            self.get_test_file_path(self.changes_file))
+            testing.get_test_file_path(self.changes_file))
         processor.process()
         self.assertIsInstance(processor.changes, Changes)
         self.assertEqual(processor.changes.get_package_name(),
                          self.source_name)
 
-        self.assertEqual(len(processor.files_to_upload), 4)
+        self.assertEqual(4, len(processor.files_to_upload))

=== modified file 'cli/tests/test_cli.py'
--- cli/tests/test_cli.py	2014-05-06 16:53:31 +0000
+++ cli/tests/test_cli.py	2014-05-07 16:48:40 +0000
@@ -32,18 +32,18 @@
     capture_stdout,
     mock_load_config,
 )
-from ci_utils.testing import TestCaseWithGnupg
+from ci_utils import testing
 from ci_utils.ticket_states import (
     TicketWorkflowStep,
     TicketWorkflowStepStatus,
 )
 
 
-class MainScriptTestCase(TestCaseWithGnupg):
+class MainScriptTestCase(testing.TestCaseWithGnupg):
 
     def setUp(self):
         super(MainScriptTestCase, self).setUp()
-        curdir = os.path.dirname(__file__)
+        curdir = os.path.abspath(os.path.dirname(__file__))
         self.main_script = os.path.join(curdir, "../ubuntu-ci")
         self.cli = imp.load_source(
             "ubuntu-ci",
@@ -128,7 +128,7 @@
     @mock.patch('ci_libs.utils.patch')
     def test_add_new_ticket(self, mock_patch, mock_post, mock_process):
         """Verify cli create_ticket command for one .changes."""
-        changes = self.get_test_file_path('foobar_0.1-1_source.changes')
+        changes = testing.get_test_file_path('foobar_0.1-1_source.changes')
         args = ['create_ticket', '-t', 'New feature', '-b', '1234', '-o',
                 '[e-mail]', '-d', 'This is a cool new feature',
                 '-a', 'foo', '-r', 'bar,baz', '-s', changes]
@@ -148,8 +148,8 @@
     def test_add_new_ticket_multiple_subtickets(self, mock_patch, mock_post,
                                                 mock_process):
         """Verify cli create_ticket command for multiple .changes."""
-        changes_1 = self.get_test_file_path('foobar_0.1-1_source.changes')
-        changes_2 = self.get_test_file_path('barfoo_0.1-1_source.changes')
+        changes_1 = testing.get_test_file_path('foobar_0.1-1_source.changes')
+        changes_2 = testing.get_test_file_path('barfoo_0.1-1_source.changes')
 
         args = ['create_ticket', '-t', '"New feature"', '-b', '4321', '-o',
                 '[e-mail]', '-d', '"This is a cool new feature"',
@@ -289,7 +289,7 @@
 
     def test_cli_only_source_files_pass(self):
         """Verify cli fails in case file isn't prefixed .changes."""
-        wrong_changes = self.get_test_file_path('foobar_0.1-1.dsc')
+        wrong_changes = testing.get_test_file_path('foobar_0.1-1.dsc')
         args = ['create_ticket', '-t', '"New feature"', '-d',
                 '"This is a cool new feature"', '-o', '[e-mail]',
                 '-a', 'foo', '-s', wrong_changes]
@@ -306,7 +306,7 @@
                 return_value='http://www.example.com/api/v1/ticket/39/')
     def test_is_valid_package_list_add_space(self, mock_patch):
         """Test a ticket adding test binaries and not removing any fails."""
-        changes = self.get_test_file_path('foobar_0.1-1_source.changes')
+        changes = testing.get_test_file_path('foobar_0.1-1_source.changes')
         args = ['create_ticket', '-t', '"New feature"', '-d',
                 '"This is a cool new feature"', '-o', '[e-mail]',
                 '-a', 'foo, bar', '-s', changes]
@@ -323,7 +323,7 @@
                 return_value='http://www.example.com/api/v1/ticket/39/')
     def test_is_valid_package_list_remove_space(self, mock_patch):
         """Test a ticket removing two test binaries fails."""
-        changes = self.get_test_file_path('foobar_0.1-1_source.changes')
+        changes = testing.get_test_file_path('foobar_0.1-1_source.changes')
         args = ['create_ticket', '-t', '"New feature"', '-d',
                 '"This is a cool new feature"', '-o', '[e-mail]',
                 '-a', 'foo', '-r', 'bar, baz', '-s', changes]
@@ -345,7 +345,7 @@
                 return_value='http://www.example.com/api/v1/ticket/39/')
     def test_cli_dsc_file_in_disguise(self, mock_patch, mock_load_config):
         """Verify cli behavior when .changes file is a .dsc."""
-        wrong_changes = self.get_test_file_path('foobar_0.1-1_dsc.changes')
+        wrong_changes = testing.get_test_file_path('foobar_0.1-1_dsc.changes')
         args = ['create_ticket', '-t', '"New feature"', '-d',
                 '"This is a cool new feature"', '-o', '[e-mail]',
                 '-a', 'foo', '-s', wrong_changes]
@@ -364,7 +364,8 @@
     def test_cli_changes_file_is_something_else(self, mock_patch,
                                                 mock_load_config):
         """Verify cli behavior when provided .changes file isn't a .changes."""
-        wrong_changes = self.get_test_file_path('foobar_0.1-1_random.changes')
+        wrong_changes = testing.get_test_file_path(
+            'foobar_0.1-1_random.changes')
         args = ['create_ticket', '-t', '"New feature"', '-d',
                 '"This is a cool new feature"', '-o', '[e-mail]',
                 '-a', 'foo', '-s', wrong_changes]
@@ -383,7 +384,7 @@
     def test_cli_changes_file_unsigned_fails(self, mock_patch,
                                              mock_load_config):
         """Verify cli behavior when provided .changes isn't signed."""
-        unsigned_changes = self.get_test_file_path(
+        unsigned_changes = testing.get_test_file_path(
             'foobar_0.1-1_unsigned.changes')
         args = ['create_ticket', '-t', '"New feature"', '-d',
                 '"This is a cool new feature"', '-o', '[e-mail]',
@@ -403,7 +404,7 @@
     def test_cli_changes_file_is_unreleased(self, mock_patch,
                                             mock_load_config):
         """Verify cli behavior when provided .changes file is UNRELEASED."""
-        wrong_changes = self.get_test_file_path(
+        wrong_changes = testing.get_test_file_path(
             'foobar_0.1-1_unreleased.changes')
         args = ['create_ticket', '-t', '"New feature"', '-d',
                 '"This is a cool new feature"', '-o', '[e-mail]',

=== modified file 'cli/tests/test_ticket.py'
--- cli/tests/test_ticket.py	2014-05-06 16:53:31 +0000
+++ cli/tests/test_ticket.py	2014-05-07 16:48:40 +0000
@@ -19,18 +19,18 @@
 import mock
 import imp
 
+from ci_utils import testing
 from ci_libs.ticket import (
     SubTicket,
     Ticket,
 )
-from ci_utils.testing import TestCaseWithGnupg
-
-
-class SubTicketTestCase(TestCaseWithGnupg):
-
+
+
+class SubTicketTestCase(testing.TestCaseWithGnupg):
     def setUp(self):
         super(SubTicketTestCase, self).setUp()
-        self.changes = self.get_test_file_path('foobar_0.1-1_source.changes')
+        self.changes = testing.get_test_file_path(
+            'foobar_0.1-1_source.changes')
 
     @mock.patch('ci_libs.utils.post',
                 return_value='http://www.example.com/api/v1/sourcepackage/4/')
@@ -79,7 +79,7 @@
         new_subticket._create_subticket()
 
 
-class TicketTestCase(TestCaseWithGnupg):
+class TicketTestCase(testing.TestCaseWithGnupg):
 
     def setUp(self):
         super(TicketTestCase, self).setUp()
@@ -91,7 +91,7 @@
     @mock.patch('ci_libs.utils.post',
                 return_value='http://www.example.com/api/v1/ticket/38/')
     def test_create_ticket(self, mock_post):
-        changes = self.get_test_file_path('foobar_0.1-1_source.changes')
+        changes = testing.get_test_file_path('foobar_0.1-1_source.changes')
         args = ['create_ticket', '-t', 'New feature', '-b', '1234', '-o',
                 '[e-mail]', '-d', 'This is a cool new feature',
                 '-a', 'foo', '-r', 'baz', '-s', changes]

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-05-07 00:44:08 +0000
+++ juju-deployer/deploy.py	2014-05-07 16:48:40 +0000
@@ -17,8 +17,9 @@
 import argparse
 import atexit
 import base64
-from  distutils import spawn
+from distutils import spawn
 import hashlib
+import importlib
 import itertools
 import logging
 import os
@@ -375,15 +376,24 @@
         sys.exit(1)
 
 
-def check_dependencies():
+def check_dependencies(needed_commands=None, needed_imports=None):
     '''Exit the application if we are missing any dependency programs'''
 
-    needed_commands = ['cheetah']
-    for cmd in needed_commands:
-        if not spawn.find_executable(cmd):
-            err = "%s is missing. Please install it before continuing." % cmd
-            print >>sys.stderr, err
-            sys.exit(1)
+    err = "%s is missing. Please install it before continuing."
+    if needed_commands:
+        for cmd in needed_commands:
+            if not spawn.find_executable(cmd):
+                err = err % cmd
+                print >>sys.stderr, err
+                sys.exit(1)
+    if needed_imports:
+        for impt in needed_imports:
+            try:
+                importlib.import_module(impt)
+            except:
+                err = err % impt
+                print >>sys.stderr, err
+                sys.exit(1)
 
 
 def populate_all_templates():
@@ -771,7 +781,7 @@
     if args.private_ppas_only:
         os.environ['CI_PRIVATE_PPAS_ONLY'] = '1'
 
-    check_dependencies()
+    check_dependencies(needed_commands=['cheetah'])
 
     if not args.build_only:
         check_bootstrapped()

=== modified file 'juju-deployer/test_deploy.py'
--- juju-deployer/test_deploy.py	2014-05-06 21:33:18 +0000
+++ juju-deployer/test_deploy.py	2014-05-07 16:48:40 +0000
@@ -14,8 +14,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
+import sys
 import mock
-import os
 import tempfile
 import shutil
 import subprocess
@@ -108,13 +109,20 @@
         super(TestCheckDependencies, self).setUp()
         fixtures.set_uniq_cwd(self)
 
-    def test_check_dependencies_fails(self):
-        # check_dependencies bails out if it can't find the (executables)
-        # project dependencies.
+    def test_check_dependencies_needed_commands(self):
+        # If we cannot find any of our dependencies, this program should bail
+        # out.
         fixtures.isolate_from_env(self, dict(PATH=''))
         with mock.patch('sys.stderr'):
             with self.assertRaises(SystemExit):
-                deploy.check_dependencies()
+                deploy.check_dependencies(needed_commands=['cheetah'])
+
+    def test_check_dependencies_needed_imports(self):
+        # If we cannot find any of our import dependencies, this program should
+        # bail out.
+        with mock.patch('sys.stderr'):
+            with self.assertRaises(SystemExit):
+                deploy.check_dependencies(needed_imports=['IDONTEXIST'])
 
 
 class TestBootStrap(unittest.TestCase):

=== modified file 'tests/deployers.py'
--- tests/deployers.py	2014-04-29 16:03:15 +0000
+++ tests/deployers.py	2014-05-07 16:48:40 +0000
@@ -17,17 +17,15 @@
 import os
 import subprocess
 import sys
-import unittest
 
+import yaml
+import amulet
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 # We need access to ci_utils
 sys.path.append(os.path.join(HERE, '..', 'ci-utils'))
 
-import amulet
-from ci_utils.tests import features
-import yaml
-
+from ci_utils.testing import features, TestCaseWithGnupg
 
 
 class AmuletDeployment(object):
@@ -65,7 +63,7 @@
 
 
 @features.requires(features.bootstrapped_juju)
-class DeployerTest(unittest.TestCase):
+class DeployerTest(TestCaseWithGnupg):
     '''Base class for building juju deployer based tests.'''
 
     deployer_cfg = None

=== modified file 'tests/run.py'
--- tests/run.py	2014-04-28 14:45:39 +0000
+++ tests/run.py	2014-05-07 16:48:40 +0000
@@ -139,7 +139,7 @@
         # named like the component, we keep matching on that.
         for one in only:
             file_name = 'test_{}.py'.format(one)
-            if  file_name in tests:
+            if file_name in tests:
                 selected.append(file_name)
             else:
                 msg = "Skipping {} as {} does not exist in {}"
@@ -219,6 +219,7 @@
 
 def main():
     check_nova_env()
+    deploy.check_dependencies(needed_imports=['gnupg'])
 
     test_dir = os.path.dirname(sys.argv[0])
     tests = get_tests(test_dir)

=== modified file 'tests/test_integration.py'
--- tests/test_integration.py	2014-04-16 18:36:03 +0000
+++ tests/test_integration.py	2014-05-07 16:48:40 +0000
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import sys
 import json
 import tempfile
 import subprocess
@@ -25,8 +26,10 @@
 
 import deployers
 
-
 HERE = os.path.abspath(os.path.dirname(__file__))
+sys.path.append(os.path.join(HERE, '..', 'ci-utils'))
+
+from ci_utils import testing
 
 
 def create_virtual_env():
@@ -42,8 +45,7 @@
 def run_virtual_env(temp_dir, args, cwd=None):
     if args is 'create':
         cwd = os.path.join(HERE, '../cli')
-        changes = os.path.abspath(os.path.join(HERE,
-            '../cli/tests/data/foobar_0.1-1_source.changes'))
+        changes = testing.get_test_file_path('foobar_0.1-1_source.changes')
         args = ('python ubuntu-ci create_ticket -t "New feature" -b 1234 -o '
                 '[e-mail] -d "This is a cool new feature" -a foo '
                 '-s %s' % changes)
@@ -69,8 +71,8 @@
         p = os.path.join(HERE, '../cli/setup.py')
         args = '%s develop' % p
         run_virtual_env(self.temp_dir, args)
-        config_url = 'http://{}:{}'
-        config_url = config_url.format(*self.get_ip_and_port('ts-django'))
+        config_url = 'http://{}'.format(
+            self.get_ip_and_port('webui-apache')[0])
         config = os.path.join(os.environ["HOME"], '.ubuntu-ci')
         with open(config, 'a') as fp:
             fp.write('ci_url: "{}"\n'.format(config_url))
@@ -78,8 +80,8 @@
         run_virtual_env(self.temp_dir, args='create')
         self.addCleanup(delete_virtual_env, self.temp_dir)
 
-    def get_server_status_and_content(self, url, service='ts-django'):
-        final_url = url.format(*self.get_ip_and_port(service))
+    def get_server_status_and_content(self, url, service='webui-apache'):
+        final_url = url.format(self.get_ip_and_port(service)[0])
 
         client = httplib2.Http()
         resp, content = client.request(final_url, 'GET')
@@ -91,7 +93,7 @@
         up with the proper status when viewed via the API.
         """
 
-        url = 'http://{}:{}/api/v1/ticket/1/'
+        url = 'http://{}/api/v1/ticket/1/'
         resp, content = self.get_server_status_and_content(url)
         content = json.loads(content)
         self.assertEqual(resp['status'], '200')
@@ -103,12 +105,11 @@
         This tests that the WebUI main page shows the ticket that we created
         via the CLI
         """
-        url = 'http://{}:{}/'
-        resp, content = self.get_server_status_and_content(
-            url, service='webui-apache')
+        url = 'http://{}/'
+        resp, content = self.get_server_status_and_content(url)
 
         self.assertEqual(resp['status'], '200')
-        self.assertIn('<a href="/" class="first ">Ticket List</a>', content)
+        self.assertIn('<a href="/" class="first active">Tickets</a>', content)
 
 
 if __name__ == "__main__":