Merge lp:~rvb/maas-test/update-proxy into lp:maas-test

[Raphaël Badin]

Always run `apt-get update` before installing packages to avoid (as much as possible) races when the content of the archive changes. Also: Use the defined proxy when running `apt-get update`.

[Julian Edwards (julian-edwards)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlNdqvIACgkQWhGlTF8G/Hf2TgCfZuuTiJ4ZBcG5RxjXSXQUd3km
BIwAoKOnx9OulLzTzu0uEJdOZsnwg4Ni
=dwak
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'maastest/kvmfixture.py'
--- maastest/kvmfixture.py	2014-04-10 05:15:23 +0000
+++ maastest/kvmfixture.py	2014-04-26 08:40:07 +0000
@@ -304,14 +304,14 @@
             self.architecture)
 
     def configure_archives(self):
-        """Add repositories to the VM and update the list of packages."""
+        """Add repositories to the VM."""
         if self.archives is not None:
             for archive in self.archives:
                 self.run_command(
                     ["sudo", "add-apt-repository", "-y", archive],
                     check_call=True)
-        self.run_command(
-            ["sudo", "apt-get", "update"], check_call=True)
+        # No need to update the list of packages, it's done before
+        # any package installation to avoid, as much as possible, races.
 
     def configure_network(self):
         """Configure the virtual machine network.
@@ -381,11 +381,16 @@
         """Install the given packages on the virtual machine."""
         return [
             'sudo',
-            'http_proxy=%s' % self.proxy_url,
-            'https_proxy=%s' % self.proxy_url,
-            'DEBIAN_FRONTEND=noninteractive',
-            'apt-get', 'install', '-y'
-            ] + list(packages)
+            'sh', '-c',
+            'export http_proxy=%s; '
+            'export https_proxy=%s; '
+            'export DEBIAN_FRONTEND=noninteractive; '
+            'apt-get update; '
+            'apt-get install -y %s' % (
+                self.proxy_url,
+                self.proxy_url,
+                ' '.join(list(packages)))
+            ]
 
     def install_packages(self, packages):
         """Install the given packages on the virtual machine."""

=== modified file 'maastest/tests/test_kvmfixture.py'
--- maastest/tests/test_kvmfixture.py	2014-04-10 05:14:35 +0000
+++ maastest/tests/test_kvmfixture.py	2014-04-26 08:40:07 +0000
@@ -502,27 +502,11 @@
         add_archive_cmds = [
             ["sudo", "add-apt-repository", "-y", archives[0]],
             ["sudo", "add-apt-repository", "-y", archives[1]],
-            ["sudo", "apt-get", "update"],
         ]
         self.assertEqual(
             [mock.call(cmd, check_call=True) for cmd in add_archive_cmds],
             run_command_mock.mock_calls)
 
-    def test_configure_archives_always_updates(self):
-        mock_identity = mock.MagicMock()
-        mock_identity.return_value = "ubuntu@test"
-        self.patch(kvmfixture.KVMFixture, 'identity', mock_identity)
-        run_command_mock = mock.MagicMock(return_value=(0, '', ''))
-        self.patch(kvmfixture.KVMFixture, 'run_command', run_command_mock)
-        fixture = self.make_KVMFixture(
-            'series', 'architecture', archives=None)
-
-        fixture.configure_archives()
-
-        self.assertEqual(
-            [mock.call(["sudo", "apt-get", "update"], check_call=True)],
-            run_command_mock.mock_calls)
-
     def test_configure_network_configures_network(self):
         series = "test-series"
         architecture = "test-arch"
@@ -563,6 +547,23 @@
                 check_call=True),
             fake_run_command.mock_calls[-1])
 
+    def test_make_apt_get_install_command_returns_command(self):
+        fixture = self.make_KVMFixture('series', 'architecture')
+        packages = [self.getUniqueString(), self.getUniqueString()]
+        command = fixture._make_apt_get_install_command(packages)
+        self.assertEqual(
+            [
+                "sudo", "sh",  "-c",
+                "export http_proxy=%s; export https_proxy=%s; "
+                "export DEBIAN_FRONTEND=noninteractive; "
+                "apt-get update; apt-get install -y %s" % (
+                    self.proxy_url,
+                    self.proxy_url,
+                    ' '.join(packages),
+                )
+            ],
+            command)
+
     def test_install_packages_runs_apt_get_noninteractively_with_check(self):
         self.patch_run_command()
         packages = ['foo', 'bar']