Merge pull request influxdata#301 from canardleteer/master

aviau · aviau · commit 0a193cf2e873 · 2016-03-18T09:40:21.000-04:00
Make InfluxDBClient to force an integer as the HTTP(s) port.
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -76,7 +76,7 @@ def __init__(self,
                  ):
         """Construct a new InfluxDBClient object."""
         self.__host = host
-        self.__port = port
+        self.__port = int(port)
         self._username = username
         self._password = password
         self._database = database
diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py
@@ -794,6 +794,10 @@ def test_revoke_privilege_invalid(self):
         with _mocked_session(cli, 'get', 400):
             self.cli.revoke_privilege('', 'testdb', 'test')
 
+    def test_invalid_port_fails(self):
+        with self.assertRaises(ValueError):
+            InfluxDBClient('host', '80/redir', 'username', 'password')
+
 
 class FakeClient(InfluxDBClient):
 
diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py
@@ -295,6 +295,10 @@ def test_revoke_privilege_invalid(self):
         self.assertIn('{"error":"error parsing query: ',
                       ctx.exception.content)
 
+    def test_invalid_port_fails(self):
+        with self.assertRaises(ValueError):
+            InfluxDBClient('host', '80/redir', 'username', 'password')
+
 
 @skipServerTests
 class CommonTests(ManyTestCasesWithServerMixin,
