diff options
| author | Scott Moser <smoser@ubuntu.com> | 2018-09-26 21:29:27 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2018-09-26 21:29:27 +0000 |
| commit | facb92c5b55f4d27ee971eaf49c580fbf92ac2c3 (patch) | |
| tree | 0dbb6503066167ec4b50b2c58b687c8bde8aec88 /tests/cloud_tests/testcases/modules | |
| parent | fd873fa83fb5ca9c6d5f22a7bec6a308448c77ff (diff) | |
| download | vyos-cloud-init-facb92c5b55f4d27ee971eaf49c580fbf92ac2c3.tar.gz vyos-cloud-init-facb92c5b55f4d27ee971eaf49c580fbf92ac2c3.zip | |
lxd: adjust to snap installed lxd.
Relax expectation on path to lxc and lxd. The deb path still does
install them in /usr/bin/ but that is overly pedantic.
Add a 'lxd waitready' (present since lxd 0.5) to wait until lxd
is ready before operating on it.
Diffstat (limited to 'tests/cloud_tests/testcases/modules')
| -rw-r--r-- | tests/cloud_tests/testcases/modules/lxd_bridge.py | 4 | ||||
| -rw-r--r-- | tests/cloud_tests/testcases/modules/lxd_dir.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/cloud_tests/testcases/modules/lxd_bridge.py b/tests/cloud_tests/testcases/modules/lxd_bridge.py index c0262ba3..f6011dee 100644 --- a/tests/cloud_tests/testcases/modules/lxd_bridge.py +++ b/tests/cloud_tests/testcases/modules/lxd_bridge.py @@ -10,12 +10,12 @@ class TestLxdBridge(base.CloudTestCase): def test_lxd(self): """Test lxd installed.""" out = self.get_data_file('lxd') - self.assertIn('/usr/bin/lxd', out) + self.assertIn('/lxd', out) def test_lxc(self): """Test lxc installed.""" out = self.get_data_file('lxc') - self.assertIn('/usr/bin/lxc', out) + self.assertIn('/lxc', out) def test_bridge(self): """Test bridge config.""" diff --git a/tests/cloud_tests/testcases/modules/lxd_dir.py b/tests/cloud_tests/testcases/modules/lxd_dir.py index 1495674e..26a3db39 100644 --- a/tests/cloud_tests/testcases/modules/lxd_dir.py +++ b/tests/cloud_tests/testcases/modules/lxd_dir.py @@ -10,11 +10,11 @@ class TestLxdDir(base.CloudTestCase): def test_lxd(self): """Test lxd installed.""" out = self.get_data_file('lxd') - self.assertIn('/usr/bin/lxd', out) + self.assertIn('/lxd', out) def test_lxc(self): """Test lxc installed.""" out = self.get_data_file('lxc') - self.assertIn('/usr/bin/lxc', out) + self.assertIn('/lxc', out) # vi: ts=4 expandtab |