diff options
| author | Joshua Powers <josh.powers@canonical.com> | 2017-05-22 12:13:55 -0700 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-05-23 15:17:42 -0400 |
| commit | 06a7f0afc4db3f8ba2a6b3b521274ee45a028ef2 (patch) | |
| tree | d61a5a7595945e31b13a4414d82706d6092c50b0 | |
| parent | f38fa41317602908139aa96e930b634f65e39555 (diff) | |
| download | cloud-init-git-06a7f0afc4db3f8ba2a6b3b521274ee45a028ef2.tar.gz | |
tests: Apply workaround for snapd bug in test case.
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).
| -rw-r--r-- | tests/cloud_tests/configs/modules/snappy.yaml | 4 | ||||
| -rw-r--r-- | tests/cloud_tests/testcases/modules/snappy.py | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/cloud_tests/configs/modules/snappy.yaml b/tests/cloud_tests/configs/modules/snappy.yaml index 923bfe12..0e7dc852 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 3e2f5924..b92271c1 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 |