瀏覽代碼

Handle invalid log_driver

Now docker-py isn't hardcoding a list of valid log_drivers, we
can expect an APIError in response rather than a ValueError
if we send an invalid log_driver.

Signed-off-by: Mazz Mosley <[email protected]>
Mazz Mosley 10 年之前
父節點
當前提交
2f45649611
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      tests/integration/service_test.py

+ 4 - 1
tests/integration/service_test.py

@@ -864,7 +864,10 @@ class ServiceTest(DockerClientTestCase):
 
     def test_log_drive_invalid(self):
         service = self.create_service('web', log_driver='xxx')
-        self.assertRaises(APIError, lambda: create_and_start_container(service))
+        expected_error_msg = "logger: no log driver named 'xxx' is registered"
+
+        with self.assertRaisesRegexp(APIError, expected_error_msg):
+            create_and_start_container(service)
 
     def test_log_drive_empty_default_jsonfile(self):
         service = self.create_service('web')