fixing tests for port range support. fixes docker#1102

Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>

Author: yuval-k

tests/unit/service_test.py

@@ -117,33 +117,61 @@ def test_get_volumes_from_service_no_container(self):
 
     def test_split_port_with_host_ip(self):
         internal_port, external_port = split_port("127.0.0.1:1000:2000")
-        self.assertEqual(internal_port, "2000")
-        self.assertEqual(external_port, ("127.0.0.1", "1000"))
+        self.assertEqual(internal_port, ["2000"])
+        self.assertEqual(external_port, [("127.0.0.1", "1000")])
 
     def test_split_port_with_protocol(self):
         internal_port, external_port = split_port("127.0.0.1:1000:2000/udp")
-        self.assertEqual(internal_port, "2000/udp")
-        self.assertEqual(external_port, ("127.0.0.1", "1000"))
+        self.assertEqual(internal_port, ["2000/udp"])
+        self.assertEqual(external_port, [("127.0.0.1", "1000")])
 
     def test_split_port_with_host_ip_no_port(self):
         internal_port, external_port = split_port("127.0.0.1::2000")
-        self.assertEqual(internal_port, "2000")
-        self.assertEqual(external_port, ("127.0.0.1", None))
+        self.assertEqual(internal_port, ["2000"])
+        self.assertEqual(external_port, [("127.0.0.1", None)])
+
+    def test_split_port_range_with_host_ip_no_port(self):
+        internal_port, external_port = split_port("127.0.0.1::2000-2001")
+        self.assertEqual(internal_port, ["2000", "2001"])
+        self.assertEqual(external_port, [("127.0.0.1", None), ("127.0.0.1", None)])
 
     def test_split_port_with_host_port(self):
         internal_port, external_port = split_port("1000:2000")
-        self.assertEqual(internal_port, "2000")
-        self.assertEqual(external_port, "1000")
+        self.assertEqual(internal_port, ["2000"])
+        self.assertEqual(external_port, ["1000"])
+
+    def test_split_port_range_with_host_port(self):
+        internal_port, external_port = split_port("1000-1001:2000-2001")
+        self.assertEqual(internal_port, ["2000", "2001"])
+        self.assertEqual(external_port, ["1000", "1001"])
 
     def test_split_port_no_host_port(self):
         internal_port, external_port = split_port("2000")
-        self.assertEqual(internal_port, "2000")
+        self.assertEqual(internal_port, ["2000"])
         self.assertEqual(external_port, None)
 
+    def test_split_port_range_no_host_port(self):
+        internal_port, external_port = split_port("2000-2001")
+        self.assertEqual(internal_port, ["2000", "2001"])
+        self.assertEqual(external_port, None)
+
+    def test_split_port_range_with_protocol(self):
+        internal_port, external_port = split_port("127.0.0.1:1000-1001:2000-2001/udp")
+        self.assertEqual(internal_port, ["2000/udp", "2001/udp"])
+        self.assertEqual(external_port, [("127.0.0.1", "1000"), ("127.0.0.1", "1001")])
+
     def test_split_port_invalid(self):
         with self.assertRaises(ConfigError):
             split_port("0.0.0.0:1000:2000:tcp")
 
+    def test_non_matching_length_port_ranges(self):
+        with self.assertRaises(ConfigError):
+            split_port("0.0.0.0:1000-1010:2000-2002/tcp")
+
+    def test_port_and_range_invalid(self):
+        with self.assertRaises(ConfigError):
+            split_port("0.0.0.0:1000:2000-2002/tcp")
+
     def test_build_port_bindings_with_one_port(self):
         port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
         self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000")])
@@ -157,6 +185,21 @@ def test_build_port_bindings_with_nonmatching_internal_ports(self):
         self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000")])
         self.assertEqual(port_bindings["2000"],[("127.0.0.1","2000")])
 
+    def test_build_port_bindings_with_port_range(self):
+        port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001"])
+        self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000")])
+        self.assertEqual(port_bindings["1001"],[("127.0.0.1","1001")])
+
+    def test_build_port_bindings_with_matching_internal_port_ranges(self):
+        port_bindings = build_port_bindings(["127.0.0.1:1000-1001:1000-1001","127.0.0.1:2000-2001:1000-1001"])
+        self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000"),("127.0.0.1","2000")])
+        self.assertEqual(port_bindings["1001"],[("127.0.0.1","1001"),("127.0.0.1","2001")])
+
+    def test_build_port_bindings_with_nonmatching_internal_port_ranges(self):
+        port_bindings = build_port_bindings(["127.0.0.1:1000:1000","127.0.0.1:2000:2000"])
+        self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000")])
+        self.assertEqual(port_bindings["2000"],[("127.0.0.1","2000")])
+
     def test_split_domainname_none(self):
         service = Service('foo', hostname='name', client=self.mock_client)
         self.mock_client.containers.return_value = []