Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/dont-delete-ephemeral into lp:snappy-ecosystem-tests

[Omer Akram]

Don't try to delete ephemeral container as they get deleted on stop.

Don't try to delete ephemeral container as they get deleted on stop.

Previously we were working around a bug in pylxd that is now fixed and available from pip.

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:39
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/278/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2107/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/278/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/dont-delete-ephemeral]

40. By Omer Akram on 2017-03-10

pylint

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:40
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/279/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2108/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/279/rebuild

review: Approve (continuous-integration)

[Santiago Baldassin (sbaldassin)]

Looks good

review: Approve

=== modified file 'snappy_ecosystem_tests/environment/containers/lxd.py'
--- snappy_ecosystem_tests/environment/containers/lxd.py	2017-03-09 12:40:49 +0000
+++ snappy_ecosystem_tests/environment/containers/lxd.py	2017-03-10 09:32:30 +0000
@@ -25,7 +25,7 @@
 import time
 
 from pylxd import Client
-from pylxd.exceptions import LXDAPIException, NotFound
+from pylxd.exceptions import LXDAPIException
 from retrying import retry
 
 from snappy_ecosystem_tests.environment.data.snapd import (
@@ -50,17 +50,12 @@
         for cont in containers:
             if self.client.containers.exists(cont):
                 container = self.client.containers.get(cont)
-                try:
-                    if container.status == "Running":
-                        container.stop(wait=True)
+                if container.status == 'Running':
+                    container.stop(wait=True)
+                # Don't try to delete ephemeral container as its
+                # deleted on stop.
+                if not container.ephemeral:
                     container.delete(wait=True)
-                except NotFound:
-                    # If using ephemeral stop will delete the container and try
-                    # to sync which will fail because the container does not
-                    # exist. container.delete will be only execute if stop did
-                    # not raise an exception:
-                    # https://github.com/lxc/pylxd/issues/221
-                    pass
             container_config = DEFAULT_CONTAINER_CONFIG.copy()
             container_config['source']['alias'] = containers[cont]['release']
             container_config['name'] = cont