Merge lp:~cjohnston/ubuntu-ci-services-itself/more-tarmac-testing into lp:ubuntu-ci-services-itself

[Chris Johnston]

Add juju-deployer/test_deploy.py and tests/test_run.py to tarmac testing

[Andy Doan (doanac)]

46 + os.fchmod(fp.fileno(), stat.S_IWUSR)
47 + with mock.patch('__builtin__.open', side_effect=e):

I would think you'd need one or the other, but not both. ie - if you make the file non-readable, you shouldn't shouldn't need to mock. or if you mock, you shouldn't have to alter file permssions.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~cjohnston/ubuntu-ci-services-itself/more-tarmac-testing]

216. By Chris Johnston on 2014-02-05

Removes unneeded mock from sudoers test

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'tarmac.sh'
--- tarmac.sh	2014-02-05 20:34:52 +0000
+++ tarmac.sh	2014-02-05 23:21:33 +0000
@@ -39,3 +39,8 @@
 	./$x/setup.py develop
 	./$x/setup.py test
 done
+
+echo "== Testing ./juju-deployer/test_deploy.py ...."
+USER=foo ./juju-deployer/test_deploy.py
+echo "== Testing ./tests/test_run.py ...."
+./tests/test_run.py

=== modified file 'tests/test_run.py'
--- tests/test_run.py	2014-02-05 15:26:12 +0000
+++ tests/test_run.py	2014-02-05 23:21:33 +0000
@@ -8,6 +8,7 @@
 import shutil
 import os
 import logging
+import stat
 import swiftclient
 from novaclient.exceptions import NotFound
 
@@ -68,7 +69,9 @@
             self.assertTrue(os.path.exists(os.path.join(amulet_dir, '.bzr')))
             self.assertEqual(os.environ['PYTHONPATH'], '%s' % amulet_dir)
 
-    def test_needs_bootstrap(self):
+    @mock.patch('run._get_control_bucket',
+                return_value='juju-d911b43e427c204cfcfd8c7276c4b2aa')
+    def test_needs_bootstrap(self, mock_get_control_bucket):
         provider_state = '{ state-instances: ["abcdefg"] }'
         with mock.patch('run._get_from_swift', return_value=provider_state):
             # Bootstrap needed - the bucket exists but the instance does not.
@@ -98,10 +101,8 @@
             fp.flush()
             self.assertTrue(run.check_sudoers(fp.name))
 
-        # Unreadable.
-        e = IOError(13, 'Permission denied')
-        with mock.patch('__builtin__.open', side_effect=e):
-            self.assertTrue(run.check_sudoers())
+            os.fchmod(fp.fileno(), stat.S_IWUSR)
+            self.assertTrue(run.check_sudoers(fp.name))
 
     def test_check_juju_version(self):
         with mock.patch('subprocess.check_output', return_value='1.16.4'):