From 5e2ecff8a15f592b755bb1fffba69992cda450d9 Mon Sep 17 00:00:00 2001
From: Mazz Mosley <mazz@houseofmnowster.com>
Date: Wed, 12 Aug 2015 15:19:28 +0100
Subject: [PATCH] Fix ports validation

I had misunderstood the valid formats allowed for ports. They must
always be in a list.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
---
 compose/config/schema.json | 30 ++++++++++++++----------------
 tests/unit/config_test.py  |  4 ++--
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/compose/config/schema.json b/compose/config/schema.json
index 24fd53d116..b615aa2016 100644
--- a/compose/config/schema.json
+++ b/compose/config/schema.json
@@ -75,22 +75,20 @@
         "pid": {"type": "string"},
 
         "ports": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {"type": "string"},
-              "uniqueItems": true,
-              "format": "ports"
-            },
-            {
-              "type": "string",
-              "format": "ports"
-            },
-            {
-              "type": "number",
-              "format": "ports"
-            }
-          ]
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "ports"
+              },
+              {
+                "type": "number",
+                "format": "ports"
+              }
+            ]
+          },
+          "uniqueItems": true
         },
 
         "privileged": {"type": "string"},
diff --git a/tests/unit/config_test.py b/tests/unit/config_test.py
index 44d757d6b4..136a11834c 100644
--- a/tests/unit/config_test.py
+++ b/tests/unit/config_test.py
@@ -77,7 +77,7 @@ class ConfigTest(unittest.TestCase):
     def test_config_invalid_ports_format_validation(self):
         expected_error_msg = "Service 'web' configuration key 'ports' contains an invalid type"
         with self.assertRaisesRegexp(ConfigurationError, expected_error_msg):
-            for invalid_ports in [{"1": "8000"}, False, 0]:
+            for invalid_ports in [{"1": "8000"}, False, 0, "8000", 8000, ["8000", "8000"]]:
                 config.load(
                     config.ConfigDetails(
                         {'web': {'image': 'busybox', 'ports': invalid_ports}},
@@ -87,7 +87,7 @@ class ConfigTest(unittest.TestCase):
                 )
 
     def test_config_valid_ports_format_validation(self):
-        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"], "8000", 8000]
+        valid_ports = [["8000", "9000"], ["8000/8050"], ["8000"], [8000], ["49153-49154:3002-3003"]]
         for ports in valid_ports:
             config.load(
                 config.ConfigDetails(