fix waiting for auto_remove container

use the same logic as the cli to wait for the exit of a container when
running one: ensure that a container run with auto_remove set to True
has been removed when the function returns.

this prevents a race condition when trying to run another container with
the same name directly afterwards.

signed-off-by: hugues de keyzer <docker@hugues.info>

Author: hugues de keyzer

docker/models/containers.py

@@ -894,7 +894,11 @@ def run(self, image, command=None, stdout=True, stderr=False,
                 stdout=stdout, stderr=stderr, stream=True, follow=True
             )
 
-        exit_status = container.wait()['StatusCode']
+        if kwargs.get('auto_remove'):
+            wait_condition = 'removed'
+        else:
+            wait_condition = 'next-exit'
+        exit_status = container.wait(condition=wait_condition)['StatusCode']
         if exit_status != 0:
             out = None
             if not kwargs.get('auto_remove'):