Merge lp:~sinzui/juju-release-tools/better-binaries into lp:juju-release-tools

[Curtis Hovey]

Wait for package building output.

Aaron noticed that the subprocess call to make the binary packages never called wait(), which explains much of the async out put we see in successful builds. Since we don't care about pipes to the proc, we only want the return code, I switched to subprocess.call() to do what we want.

I had tried to also switch to use the ubuntu-cloud lxc template because precise supports it and machines on our private networks can access cloud-images (unlike the download lxc images). I abandoned the effort because I saw unmet deps in when setting of the build in the container. I think the cloud-images are too unstable for our needs.

[Martin Packman (gz)]

Using communicate will always wait, but it doesn't do anything else useful if no pipes are being used. So, this change is good but isn't fixing a glaring error.

review: Approve

=== modified file 'build_package.py'
--- build_package.py	2015-06-24 01:07:32 +0000
+++ build_package.py	2015-07-23 17:28:06 +0000
@@ -133,9 +133,7 @@
     subprocess.check_call(['sudo', 'lxc-start', '-d', '-n', container])
     try:
         build_script = BUILD_DEB_TEMPLATE.format(container=container, ppa=ppa)
-        proc = subprocess.Popen([build_script], shell=True)
-        proc.communicate()
-        returncode = proc.returncode
+        returncode = subprocess.call([build_script], shell=True)
     finally:
         subprocess.check_call(['sudo', 'lxc-stop', '-n', container])
         user = os.environ.get('USER', 'jenkins')

=== modified file 'tests/test_build_package.py'
--- tests/test_build_package.py	2015-05-22 18:26:55 +0000
+++ tests/test_build_package.py	2015-07-23 17:28:06 +0000
@@ -171,13 +171,11 @@
             source_files = make_source_files(workspace, 'my.dsc')
             build_dir = setup_local(
                 workspace, 'trusty', 'i386', source_files, verbose=False)
-            proc = Mock(returncode=0)
-            with patch('subprocess.Popen', return_value=proc) as p_mock:
+            with patch('subprocess.call', return_value=0) as p_mock:
                 code = build_in_lxc('trusty-i386', build_dir,
                                     ppa=None, verbose=False)
         self.assertEqual(0, code)
         oc_mock.assert_any_call(build_dir, 0o777)
-        proc.communicate.assert_called_with()
         cc_mock.assert_any_call(
             ['sudo', 'lxc-start', '-d', '-n', 'trusty-i386'])
         build_script = BUILD_DEB_TEMPLATE.format(