Merge pull request #3165 from thaJeztah/tests_relax

tests/integration: update some tests for updated error-messages

Author: milas

tests/integration/api_container_test.py

@@ -122,8 +122,8 @@ def test_create_with_restart_policy(self):
         self.client.wait(id)
         with pytest.raises(docker.errors.APIError) as exc:
             self.client.remove_container(id)
-        err = exc.value.explanation
-        assert 'You cannot remove ' in err
+        err = exc.value.explanation.lower()
+        assert 'stop the container before' in err
         self.client.remove_container(id, force=True)
 
     def test_create_container_with_volumes_from(self):

tests/integration/errors_test.py

@@ -9,7 +9,7 @@ def test_api_error_parses_json(self):
         self.client.start(container['Id'])
         with pytest.raises(APIError) as cm:
             self.client.remove_container(container['Id'])
-        explanation = cm.value.explanation
-        assert 'You cannot remove a running container' in explanation
+        explanation = cm.value.explanation.lower()
+        assert 'stop the container before' in explanation
         assert '{"message":' not in explanation
         self.client.remove_container(container['Id'], force=True)