cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:cii-module-aptlist into cloud-init:master.

Commit message:
tests: update apt sources list test

Due to additional platforms getting added this test was not taking into
account platform specific mirrors nor was it checking that no additional
entries were added.


Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/335854
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~powersj/cloud-init:cii-module-aptlist into cloud-init:master.

diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.py b/tests/cloud_tests/testcases/modules/apt_configure_sources_list.py
index 129d226..cf84e05 100644
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.py
+++ b/tests/cloud_tests/testcases/modules/apt_configure_sources_list.py
@@ -10,6 +10,11 @@ class TestAptconfigureSourcesList(base.CloudTestCase):
     def test_sources_list(self):
         """Test sources.list includes sources."""
         out = self.get_data_file('sources.list')
+
+        # Verify we have 6 entires
+        self.assertEqual(6, len(out.rstrip().split('\n')))
+
+        # Verify the keys generated the list correctly
         self.assertRegex(out, r'deb http:\/\/archive.ubuntu.com\/ubuntu '
                          '[a-z].* main restricted')
         self.assertRegex(out, r'deb-src http:\/\/archive.ubuntu.com\/ubuntu '
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml b/tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml
index 143cb08..87e470c 100644
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml
+++ b/tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml
@@ -7,6 +7,12 @@ required_features:
 cloud_config: |
   #cloud-config
   apt:
+    primary:
+      - arches: [default]
+        uri: http://archive.ubuntu.com/ubuntu
+    security:
+      - arches: [default]
+        uri: http://security.ubuntu.com/ubuntu
     sources_list: |
       deb $MIRROR $RELEASE main restricted
       deb-src $MIRROR $RELEASE main restricted