Skip to content

Commit 8a9b09c

Browse files
kipekipe
committed
Change DSN-constants to be initialized in setUp.
1 parent 45f4b41 commit 8a9b09c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎tests/influxdb/client_test.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
from influxdb import InfluxDBClient, InfluxDBClusterClient
3030
from influxdb.client import InfluxDBServerError
3131

32-
DSN_STRING = 'influxdb://uSr:pWd@host:1886/db'
33-
CLUSTER_DSN_STRING = 'influxdb://uSr:pWd@host1:8086,uSr:pWd@host2:8086/db'
34-
3532

3633
def _build_response_object(status_code=200, content=""):
3734
resp = requests.Response()
@@ -98,6 +95,8 @@ def setUp(self):
9895
}
9996
]
10097

98+
self.dsn_string = 'influxdb://uSr:pWd@host:1886/db'
99+
101100
def test_scheme(self):
102101
cli = InfluxDBClient('host', 8086, 'username', 'password', 'database')
103102
self.assertEqual('http://host:8086', cli._baseurl)
@@ -108,20 +107,20 @@ def test_scheme(self):
108107
self.assertEqual('https://host:8086', cli._baseurl)
109108

110109
def test_dsn(self):
111-
cli = InfluxDBClient.from_DSN(DSN_STRING)
110+
cli = InfluxDBClient.from_DSN(self.dsn_string)
112111
self.assertEqual('http://host:1886', cli._baseurl)
113112
self.assertEqual('uSr', cli._username)
114113
self.assertEqual('pWd', cli._password)
115114
self.assertEqual('db', cli._database)
116115
self.assertFalse(cli.use_udp)
117116

118-
cli = InfluxDBClient.from_DSN('udp+' + DSN_STRING)
117+
cli = InfluxDBClient.from_DSN('udp+' + self.dsn_string)
119118
self.assertTrue(cli.use_udp)
120119

121-
cli = InfluxDBClient.from_DSN('https+' + DSN_STRING)
120+
cli = InfluxDBClient.from_DSN('https+' + self.dsn_string)
122121
self.assertEqual('https://host:1886', cli._baseurl)
123122

124-
cli = InfluxDBClient.from_DSN('https+' + DSN_STRING,
123+
cli = InfluxDBClient.from_DSN('https+' + self.dsn_string,
125124
**{'ssl': False})
126125
self.assertEqual('http://host:1886', cli._baseurl)
127126

@@ -745,6 +744,7 @@ def setUp(self):
745744
warnings.simplefilter('error', FutureWarning)
746745

747746
self.hosts = [('host1', 8086), ('host2', 8086), ('host3', 8086)]
747+
self.dsn_string = 'influxdb://uSr:pWd@host1:8086,uSr:pWd@host2:8086/db'
748748

749749
def test_init(self):
750750
cluster = InfluxDBClusterClient(hosts=self.hosts,
@@ -811,7 +811,7 @@ def test_recovery(self):
811811
self.assertEqual(2, len(cluster.bad_clients))
812812

813813
def test_dsn(self):
814-
cli = InfluxDBClusterClient.from_DSN(CLUSTER_DSN_STRING)
814+
cli = InfluxDBClusterClient.from_DSN(self.dsn_string)
815815
self.assertEqual(2, len(cli.clients))
816816
self.assertEqual('http://host1:8086', cli.clients[0]._baseurl)
817817
self.assertEqual('uSr', cli.clients[0]._username)
@@ -824,15 +824,15 @@ def test_dsn(self):
824824
self.assertEqual('db', cli.clients[1]._database)
825825
self.assertFalse(cli.clients[1].use_udp)
826826

827-
cli = InfluxDBClusterClient.from_DSN('udp+' + CLUSTER_DSN_STRING)
827+
cli = InfluxDBClusterClient.from_DSN('udp+' + self.dsn_string)
828828
self.assertTrue(cli.clients[0].use_udp)
829829
self.assertTrue(cli.clients[1].use_udp)
830830

831-
cli = InfluxDBClusterClient.from_DSN('https+' + CLUSTER_DSN_STRING)
831+
cli = InfluxDBClusterClient.from_DSN('https+' + self.dsn_string)
832832
self.assertEqual('https://host1:8086', cli.clients[0]._baseurl)
833833
self.assertEqual('https://host2:8086', cli.clients[1]._baseurl)
834834

835-
cli = InfluxDBClusterClient.from_DSN('https+' + CLUSTER_DSN_STRING,
835+
cli = InfluxDBClusterClient.from_DSN('https+' + self.dsn_string,
836836
**{'ssl': False})
837837
self.assertEqual('http://host1:8086', cli.clients[0]._baseurl)
838838
self.assertEqual('http://host2:8086', cli.clients[1]._baseurl)

‎tests/influxdb/influxdb08/client_test.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ def u(x):
2727
def u(x):
2828
return x
2929

30-
DSN_STRING = 'influxdb://uSr:pWd@host:1886/db'
31-
3230

3331
def _build_response_object(status_code=200, content=""):
3432
resp = requests.Response()
@@ -91,6 +89,8 @@ def setUp(self):
9189
}
9290
]
9391

92+
self.dsn_string = 'influxdb://uSr:pWd@host:1886/db'
93+
9494
def test_scheme(self):
9595
cli = InfluxDBClient('host', 8086, 'username', 'password', 'database')
9696
self.assertEqual(cli._baseurl, 'http://host:8086')
@@ -101,20 +101,20 @@ def test_scheme(self):
101101
self.assertEqual(cli._baseurl, 'https://host:8086')
102102

103103
def test_dsn(self):
104-
cli = InfluxDBClient.from_DSN(DSN_STRING)
104+
cli = InfluxDBClient.from_DSN(self.dsn_string)
105105
self.assertEqual('http://host:1886', cli._baseurl)
106106
self.assertEqual('uSr', cli._username)
107107
self.assertEqual('pWd', cli._password)
108108
self.assertEqual('db', cli._database)
109109
self.assertFalse(cli.use_udp)
110110

111-
cli = InfluxDBClient.from_DSN('udp+' + DSN_STRING)
111+
cli = InfluxDBClient.from_DSN('udp+' + self.dsn_string)
112112
self.assertTrue(cli.use_udp)
113113

114-
cli = InfluxDBClient.from_DSN('https+' + DSN_STRING)
114+
cli = InfluxDBClient.from_DSN('https+' + self.dsn_string)
115115
self.assertEqual('https://host:1886', cli._baseurl)
116116

117-
cli = InfluxDBClient.from_DSN('https+' + DSN_STRING,
117+
cli = InfluxDBClient.from_DSN('https+' + self.dsn_string,
118118
**{'ssl': False})
119119
self.assertEqual('http://host:1886', cli._baseurl)
120120

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy