Merge pull request #6707 from ulyssessouza/clean-containers-before-rm

Remove remaining containers on test_build_run

tests/acceptance/cli_test.py

@@ -793,6 +793,9 @@ class CLITestCase(DockerClientTestCase):
         ]
         assert containers
 
+        for c in self.project.client.containers(all=True):
+            self.addCleanup(self.project.client.remove_container, c, force=True)
+
     def test_build_shm_size_build_option(self):
         pull_busybox(self.client)
         self.base_dir = 'tests/fixtures/build-shm-size'