Skip to content

Conversation

shin-
Copy link
Contributor

@shin- shin- commented Jan 9, 2018

Fixes #1855

@feliperuhland
Copy link
Contributor

Hi @shin-. I think you just need to fix a test:

diff --git a/tests/unit/models_containers_test.py b/tests/unit/models_containers_test.py
index a479e83..95295a9 100644
--- a/tests/unit/models_containers_test.py
+++ b/tests/unit/models_containers_test.py
@@ -225,7 +225,7 @@ class ContainerCollectionTest(unittest.TestCase):
         container = client.containers.run('alpine', 'sleep 300', detach=True)
 
         assert container.id == FAKE_CONTAINER_ID
-        client.api.pull.assert_called_with('alpine', tag=None)
+        client.api.pull.assert_called_with('alpine', platform=None, tag=None)
 
     def test_run_with_error(self):
         client = make_fake_client()

Jenkins:

=================================== FAILURES ===================================
____________________ ContainerCollectionTest.test_run_pull _____________________
tests/unit/models_containers_test.py:228: in test_run_pull
    client.api.pull.assert_called_with('alpine', tag=None)
/opt/python/3.5.4/lib/python3.5/unittest/mock.py:794: in assert_called_with
    raise AssertionError(_error_message()) from cause
E   AssertionError: Expected call: pull('alpine', tag=None)
E   Actual call: pull('alpine', platform=None, tag=None)
========== 1 failed, 500 passed, 4 skipped, 1 xfailed in 4.73 seconds ==========

Signed-off-by: Joffrey F <joffrey@docker.com>
@shin- shin- force-pushed the 1855-platform-option branch from 65f7940 to f95b958 Compare January 24, 2018 00:59
@shin-
Copy link
Contributor Author

shin- commented Jan 24, 2018

@feliperuhland Thanks!

@shin- shin- added this to the 2.8.0 milestone Jan 25, 2018
@shin- shin- merged commit a15a1d2 into master Jan 25, 2018
@shin- shin- modified the milestones: 2.8.0, 3.0 Jan 26, 2018
@shin- shin- deleted the 1855-platform-option branch January 26, 2018 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants