[FAB-5028] Fix abort on docker cleanup failure

In some cases, behave tests in fabric/test/feature aborts when decomposing the test environment because "docker inspect" is executed for a docker that is listed by "docker ps" but already deleted by "docker-compose down". This patch avoids it. Change-Id: I4806d1590c591b3e2304cc9e03d593007c09a261 Signed-off-by: Jun Nemoto <[email protected]>
hyperledger · Jun 28, 2017 · 3909cb7 · 3909cb7
1 parent dc7c40b
commit 3909cb7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/test/feature/steps/compose_util.py b/test/feature/steps/compose_util.py
@@ -178,7 +178,13 @@ def rebuildContainerData(self):
         self.containerDataList = []
         for containerID in self.refreshContainerIDs():
             # get container metadata
-            container = json.loads(str(subprocess.check_output(["docker", "inspect", containerID])))[0]
+            cmd = ["docker", "inspect", containerID]
+            try:
+                output = subprocess.check_output(cmd)
+            except:
+                err = "Error occurred {0}: {1}".format(cmd, sys.exc_info()[1])
+                continue
+            container = json.loads(str(output))[0]
             # container name
             container_name = container['Name'][1:]
             # container ip address (only if container is running)