Merge lp:~rvb/maas-test/ppa-rename into lp:maas-test

[Raphaël Badin]

Rename the 'ppa' parameter into 'archive'.

As Julian pointed out, this value is passed straight on to add-apt-repository and thus it can more than just a PPA.

[Julian Edwards (julian-edwards)]

 review: approve

review: Approve

[Jeroen T. Vermeulen (jtv)]

Ahem. Sorry, forgot to enter my vote. A lot of work, but definitely an improvement.

review: Approve

=== modified file 'docs/man/maas-test.8.rst'
--- docs/man/maas-test.8.rst	2013-11-23 18:54:02 +0000
+++ docs/man/maas-test.8.rst	2013-11-25 09:26:30 +0000
@@ -77,10 +77,10 @@
   Enlist in interactive mode.  Instead of powering up the node automatically
   through IPMI, prompt the user to turn it on manually.
 
---ppa=PPA
-  Optional PPA, or Personal Package Archive.  If given, the virtual machine
-  may install packages from this additional archive as well as from the main
-  Ubuntu archive.  This is typically used to test recent versions of MAAS only
+--archive=ARCHIVE
+  Optional repository name.  If given, the virtual machine may install
+  packages from this additional archive as well as from the main Ubuntu
+  archive.  This is typically used to test recent versions of MAAS only
   published in a PPA, e.g. "ppa:maas-maintainers/dailybuilds".
 
 

=== modified file 'maastest/kvmfixture.py'
--- maastest/kvmfixture.py	2013-11-21 14:40:01 +0000
+++ maastest/kvmfixture.py	2013-11-25 09:26:30 +0000
@@ -66,7 +66,7 @@
     machine.
     """
     def __init__(self, series, architecture, direct_interface=None,
-                 direct_network=None, name=None, ppa=None):
+                 direct_network=None, name=None, archive=None):
         """Initialise a KVM-based Virtual Machine fixture.
 
         The VM's network is configured like this:
@@ -97,13 +97,13 @@
             provided and 'direct_network' is not provided, this will default
             to the network 192.168.2.0/24.
         :type direct_network: netaddr.IPNetwork
-        :param ppa: An optional PPA name.  If provided, the PPA will
-            be added onto the VM.
-        :type ppa: string
+        :param archive: An optional repository name.  If provided, the
+            repository will be added onto the VM.
+        :type archive: string
         """
         super(KVMFixture, self).__init__()
         self.command_count = itertools.count(1)
-        self.ppa = ppa
+        self.archive = archive
         self.series = series
         self.architecture = architecture
         self.direct_interface = direct_interface
@@ -133,7 +133,7 @@
             self.wait_for_vm()
             self.wait_for_cloudinit()
             self.configure_network()
-            self.configure_ppa()
+            self.configure_archive()
             self.install_base_packages()
         except:
             self.destroy()
@@ -248,11 +248,11 @@
             "Done creating virtual machine %s, arch=%s.", self.name,
             self.architecture)
 
-    def configure_ppa(self):
-        """Add the PPA to the VM."""
-        if self.ppa is not None:
+    def configure_archive(self):
+        """Add the repository to the VM."""
+        if self.archive is not None:
             self.run_command(
-                ["sudo", "add-apt-repository", "-y", self.ppa],
+                ["sudo", "add-apt-repository", "-y", self.archive],
                 check_call=True)
 
     def configure_network(self):

=== modified file 'maastest/parser.py'
--- maastest/parser.py	2013-11-21 14:40:17 +0000
+++ maastest/parser.py	2013-11-25 09:26:30 +0000
@@ -50,11 +50,16 @@
              "the machine's interface on which the node under test should "
              "be plugged-in.")
     parser.add_argument(
-        '--ppa', type=text_type, default=None,
-        help="An optional PPA name.  If provided, that PPA will be "
-             "added onto the virtual machine.  This is typically used to "
-             "test recent versions of MAAS only published in a PPA ("
-             "e.g. ppa:maas-maintainers/dailybuilds).")
+        '--archive', type=text_type, default=None,
+        help="An optional repository name. If provided, the repository will "
+             "be added onto the virtual machine. That value is passed "
+             "on to `add-apt-repository` so it can be either a "
+             "line that can be added directly to sources.list, in the "
+             "form ppa:<user>/<ppa-name> for adding Personal Package "
+             "Archives, or a distribution component to enable. This is "
+             "typically used to test recent versions of MAAS only "
+             "published in a PPA, e.g. "
+             "ppa:maas-maintainers/dailybuilds.")
     parser.add_argument(
         '--interactive-enlistment', action='store_true',
         help="Perform an interactive enlistment. Instead of passing the "

=== modified file 'maastest/tests/test_kvmfixture.py'
--- maastest/tests/test_kvmfixture.py	2013-11-21 14:40:01 +0000
+++ maastest/tests/test_kvmfixture.py	2013-11-25 09:26:30 +0000
@@ -68,7 +68,7 @@
 
     def make_KVMFixture(self, series=None, architecture=None, name=None,
                         direct_interface=None, direct_network=None,
-                        ppa=None):
+                        archive=None):
         if series is None:
             series = self.getUniqueString()
         if architecture is None:
@@ -78,7 +78,7 @@
         fixture = kvmfixture.KVMFixture(
             series, architecture, name=name,
             direct_interface=direct_interface,
-            direct_network=direct_network, ppa=ppa)
+            direct_network=direct_network, archive=archive)
         # Hack to get fixture.addDetail to work without actually calling
         # fixture.setUp().
         fixture._details = {}
@@ -147,10 +147,10 @@
         self.patch(
             kvmfixture.KVMFixture, 'configure_network',
             mock_configure_network)
-        mock_configure_ppa = mock.MagicMock()
+        mock_configure_archive = mock.MagicMock()
         self.patch(
-            kvmfixture.KVMFixture, 'configure_ppa',
-            mock_configure_ppa)
+            kvmfixture.KVMFixture, 'configure_archive',
+            mock_configure_archive)
         series = "test-series"
         architecture = "test-arch"
         with self.make_KVMFixture(series, architecture):
@@ -166,7 +166,7 @@
                     mock_import_image.mock_calls,
                     mock_start.mock_calls,
                     mock_configure_network.mock_calls,
-                    mock_configure_ppa.mock_calls,
+                    mock_configure_archive.mock_calls,
                     mock_install_base_packages.mock_calls,
                 ])
 
@@ -438,20 +438,21 @@
         self.assertEqual(
             fixture.direct_first_available_ip(), "192.168.12.2")
 
-    def test_configure_ppa_adds_ppa(self):
+    def test_configure_archive_adds_archive(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)
-        ppa = self.getUniqueString()
-        fixture = self.make_KVMFixture('series', 'architecture', ppa=ppa)
-
-        fixture.configure_ppa()
-
-        add_ppa_cmd = ["sudo", "add-apt-repository", "-y", ppa]
+        archive = self.getUniqueString()
+        fixture = self.make_KVMFixture(
+            'series', 'architecture', archive=archive)
+
+        fixture.configure_archive()
+
+        add_archive_cmd = ["sudo", "add-apt-repository", "-y", archive]
         self.assertEqual(
-            [mock.call(add_ppa_cmd, check_call=True)],
+            [mock.call(add_archive_cmd, check_call=True)],
             run_command_mock.mock_calls)
 
     def test_configure_network_configures_network(self):