Merge pull request #2016 from mnowster/remove-unique-constraint-for-command

Remove uniqueness constraint for command
This commit is contained in:
Aanand Prasad 2015-09-09 10:05:41 -07:00
commit 9ce30e75df
2 changed files with 7 additions and 2 deletions

View File

@ -17,7 +17,12 @@
"build": {"type": "string"},
"cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
"cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
"command": {"$ref": "#/definitions/string_or_list"},
"command": {
"oneOf": [
{"type": "string"},
{"type": "array", "items": {"type": "string"}}
]
},
"container_name": {"type": "string"},
"cpu_shares": {
"oneOf": [

View File

@ -183,7 +183,7 @@ class ConfigTest(unittest.TestCase):
)
def test_invalid_list_of_strings_format(self):
expected_error_msg = "'command' contains an invalid type, valid types are string or list of strings"
expected_error_msg = "'command' contains an invalid type, valid types are string or array"
with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
config.load(
config.ConfigDetails(