Merge lp:~rvb/maas-test/bmc-params-2 into lp:maas-test

[Raphaël Badin]

Move install_package into kvm fixture.

This is a pure refactoring branch. install_package really belongs to KVMFixture and not MAASFixture. It has nothing that is MAAS-specific. I'm doing this because I'll need to install packages from KVMFixture in the next branch.

[Graham Binns (gmb)]

review: Approve

[lp:~rvb/maas-test/bmc-params-2]

49. By Raphaël Badin on 2013-11-21

Merged bmc-params into bmc-params-2.

=== modified file 'maastest/kvmfixture.py'
--- maastest/kvmfixture.py	2013-11-20 11:53:52 +0000
+++ maastest/kvmfixture.py	2013-11-21 14:40:34 +0000
@@ -51,6 +51,12 @@
 #   https://lists.ubuntu.com/archives/ubuntu-devel/2013-June/037195.html
 VM_LOCALE = "en_US.UTF-8"
 
+# Standard, non-interactive, "apt-get install" line.
+APT_GET_INSTALL = [
+    'sudo', 'DEBIAN_FRONTEND=noninteractive',
+    'apt-get', 'install', '-y',
+    ]
+
 
 class KVMFixture(Fixture):
     """A fixture for a Kernel-based Virtual Machine.
@@ -299,6 +305,11 @@
             remote_command_line,
             ]
 
+    def install_packages(self, packages):
+        """Install the given packages on the virtual machine."""
+        self.run_command(
+            APT_GET_INSTALL + list(packages), check_call=True)
+
     def run_command(self, args, input=None, check_call=False):
         """Run the given command in the VM."""
         args = self._make_ssh_command(args)

=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py	2013-11-18 16:03:32 +0000
+++ maastest/maasfixture.py	2013-11-21 14:40:34 +0000
@@ -40,13 +40,6 @@
 MAAS_ADMIN_USER = 'admin'
 
 
-# Standard, non-interactive, "apt-get install" line.
-APT_GET_INSTALL = [
-    'sudo', 'DEBIAN_FRONTEND=noninteractive',
-    'apt-get', 'install', '-y',
-    ]
-
-
 def compose_rewrite_for_default_maas_url(config_file, default_maas_url):
     """Return a shell command to rewrite `DEFAULT_MAAS_URL` in config."""
     # Comment out existing DEFAULT_MAAS_URL, and add new one.
@@ -75,11 +68,6 @@
         """
         self.kvm_fixture = kvmfixture
 
-    def install_packages(self, packages):
-        """Install the given packages on the virtual machine."""
-        self.kvm_fixture.run_command(
-            APT_GET_INSTALL + list(packages), check_call=True)
-
     def install_maas(self):
         """Install and configure MAAS in the virtual machine."""
         # Install the English language pack first.  If this is not done
@@ -88,9 +76,9 @@
         # TODO: Is there no better way to ensure this, e.g. through a
         # dependency?
         logging.info("Installing MAAS...")
-        self.install_packages(['language-pack-en'])
+        self.kvm_fixture.install_packages(['language-pack-en'])
         # Now we can install maas (which also installs postgres).
-        self.install_packages(['maas', 'maas-dhcp', 'maas-dns'])
+        self.kvm_fixture.install_packages(['maas', 'maas-dhcp', 'maas-dns'])
         logging.info("Done installing MAAS.")
 
     def configure_default_maas_url(self):
@@ -156,10 +144,10 @@
         # TODO: ARCHES and RELEASES should come from command-line
         # parameters.
         self.kvm_fixture.run_command([
-            u'sudo',
-            u'RELEASES=precise',
-            u'ARCHES=amd64/generic i386/generic',
-            u'maas-import-pxe-files',
+            'sudo',
+            'RELEASES=precise',
+            'ARCHES=amd64/generic i386/generic',
+            'maas-import-pxe-files',
             ],
             check_call=True)
         logging.info("Done importing MAAS PXE Files.")

=== modified file 'maastest/tests/test_kvmfixture.py'
--- maastest/tests/test_kvmfixture.py	2013-11-20 09:48:51 +0000
+++ maastest/tests/test_kvmfixture.py	2013-11-21 14:40:34 +0000
@@ -488,6 +488,20 @@
                 check_call=True),
             fake_run_command.mock_calls[-1])
 
+    def test_install_packages_runs_apt_get_noninteractively_with_check(self):
+        self.patch_run_command()
+        packages = ['foo', 'bar']
+        fixture = self.make_KVMFixture('series', 'architecture')
+        kvm_run_command = mock.MagicMock(return_value=(0, '', ''))
+        self.patch(kvmfixture.KVMFixture, 'run_command', kvm_run_command)
+
+        fixture.install_packages(packages)
+
+        self.assertEqual(
+            [mock.call(
+                kvmfixture.APT_GET_INSTALL + packages, check_call=True)],
+            kvm_run_command.mock_calls)
+
     def test_run_command_runs_command_remotely(self):
         fake_run_command = self.patch_run_command()
         series = "test-series"

=== modified file 'maastest/tests/test_maasfixture.py'
--- maastest/tests/test_maasfixture.py	2013-11-18 16:03:32 +0000
+++ maastest/tests/test_maasfixture.py	2013-11-21 14:40:34 +0000
@@ -221,18 +221,6 @@
         client = maas_fixture.get_maas_api_client(actual_api_key)
         self.assertIsInstance(client, MAASClient)
 
-    def test_install_packages_runs_apt_get_noninteractively_with_check(self):
-        fixture = self.make_kvm_fixture()
-        packages = ['foo', 'bar']
-        maas_fixture = maasfixture.MAASFixture(fixture)
-
-        maas_fixture.install_packages(packages)
-
-        self.assertEqual(
-            [mock.call(
-                maasfixture.APT_GET_INSTALL + packages, check_call=True)],
-            fixture.run_command.mock_calls)
-
     def test_install_maas_installs_integrates_with_install_packages(self):
         fixture = self.make_kvm_fixture()
         maas_fixture = maasfixture.MAASFixture(fixture)
@@ -241,7 +229,7 @@
 
         fixture.run_command.assert_has_call(
             mock.call(
-                maasfixture.APT_GET_INSTALL + ['language-pack-en'],
+                kvmfixture.APT_GET_INSTALL + ['language-pack-en'],
                 check_call=True),
             )
 
@@ -251,7 +239,7 @@
         fixture = self.make_kvm_fixture()
         fake_install = mock.MagicMock()
         maas_fixture = maasfixture.MAASFixture(fixture)
-        self.patch(maas_fixture, 'install_packages', fake_install)
+        self.patch(fixture, 'install_packages', fake_install)
 
         maas_fixture.install_maas()