Merge ~powersj/cloud-init:fix-integration-snappy into cloud-init:master

[Joshua Powers]

tests: Fix snapd test case for non-started service

Snapd does not start on artful or on the versions in proposed. This
changes the behavior of the test to confirm that snapd is installed, not
that it is started, while the snap team fixes the issue.

LP: #1690880

[Ryan Harper (raharper)]

Hrm, do we have a release-based (or even version-based) check here?
Presumable older images with snapd working/starting would continue to work.
Can we instead examine the installed version (via os's package system) and
infer the behavior? Or split this into two tests. one (is it installed) and then if it's installed to also check versions (ie, do we expect this to get fixed or is it an expected change in behavior?)

[Joshua Powers (powersj)]

We could have a version-based check, however the version that breaks this, 2.26, is in proposed and about to migrate to all supported releases at any day. I certainly expect this to be fixed unless someone tells me that what we are doing (e.g. running snapd in a container) isn't allowed.

My original intent with the test was to confirm that "system_snappy: auto" works by setting up and install snapd on the target system and using 'snap --version' seemed like the best method to confirm that is installed. However, this bug has shown that the output of --version changes based on whether snapd is even running.

Thoughts?

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:201e100de762c6ce47e0639eaf12449f29253344
https://jenkins.ubuntu.com/server/job/cloud-init-ci/373/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/373
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/373
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/373
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/373
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/373

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/373/rebuild

review: Approve (continuous-integration)

b6c5ed3... by Joshua Powers on 2017-05-23

Change focus of the test

The test will not determine if the snapd package is installed
correctly versus expecting certain output from the --version
option.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:b6c5ed3b04a00bba7e49ebb58947926b4f121e88
https://jenkins.ubuntu.com/server/job/cloud-init-ci/382/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/382
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/382
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/382
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/382
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/382

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/382/rebuild

review: Approve (continuous-integration)

[Joshua Powers (powersj)]

Updated the test content to check that snapd is installed using dpkg output rather than relying on --version output.

[Scott Moser (smoser)]

I'll pull this for now with a slight modification of the commit message.

review: Approve

diff --git a/tests/cloud_tests/configs/modules/snappy.yaml b/tests/cloud_tests/configs/modules/snappy.yaml
index 923bfe1..0e7dc85 100644
--- a/tests/cloud_tests/configs/modules/snappy.yaml
+++ b/tests/cloud_tests/configs/modules/snappy.yaml
@@ -6,8 +6,8 @@ cloud_config: |
   snappy:
     system_snappy: auto
 collect_scripts:
-  snap_version: |
+  snapd: |
     #!/bin/bash
-    snap --version
+    dpkg -s snapd
 
 # vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/snappy.py b/tests/cloud_tests/testcases/modules/snappy.py
index 3e2f592..b92271c 100644
--- a/tests/cloud_tests/testcases/modules/snappy.py
+++ b/tests/cloud_tests/testcases/modules/snappy.py
@@ -9,10 +9,7 @@ class TestSnappy(base.CloudTestCase):
 
     def test_snappy_version(self):
         """Test snappy version output"""
-        out = self.get_data_file('snap_version')
-        self.assertIn('snap ', out)
-        self.assertIn('snapd ', out)
-        self.assertIn('series ', out)
-        self.assertIn('ubuntu ', out)
+        out = self.get_data_file('snapd')
+        self.assertIn('Status: install ok installed', out)
 
 # vi: ts=4 expandtab