Skip to content

Commit e488f95

Browse files
ci: fix build
1 parent fb5d3f2 commit e488f95

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

tests/test_FluxCSVParser.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -251,17 +251,17 @@ def test_pandas_column_datatype(self):
251251
response_metadata_mode=FluxResponseMetadataMode.full)
252252
df = list(parser.generator())[0]
253253
self.assertEqual(13, df.dtypes.__len__())
254-
self.assertEqual('object', df.dtypes['result'].name)
254+
assert df.dtypes['result'].name in ['str', 'object']
255255
self.assertEqual('int64', df.dtypes['table'].name)
256-
self.assertIn('datetime64[ns,', df.dtypes['_start'].name)
257-
self.assertIn('datetime64[ns,', df.dtypes['_stop'].name)
258-
self.assertEqual('object', df.dtypes['_field'].name)
259-
self.assertEqual('object', df.dtypes['_measurement'].name)
260-
self.assertEqual('object', df.dtypes['host'].name)
261-
self.assertEqual('object', df.dtypes['region'].name)
256+
assert True in ['datetime64[us,' in df.dtypes['_start'].name, 'datetime64[ns,' in df.dtypes['_start'].name]
257+
assert True in ['datetime64[us,' in df.dtypes['_stop'].name, 'datetime64[ns,' in df.dtypes['_start'].name]
258+
assert df.dtypes['_field'].name in ['str', 'object']
259+
assert df.dtypes['_measurement'].name in ['str', 'object']
260+
assert df.dtypes['host'].name in ['str', 'object']
261+
assert df.dtypes['region'].name in ['str', 'object']
262262
self.assertEqual('int64', df.dtypes['value1'].name)
263263
self.assertEqual('int64', df.dtypes['value2'].name)
264-
self.assertEqual('object', df.dtypes['value3'].name)
264+
assert df.dtypes['value3'].name in ['str', 'object']
265265
self.assertEqual('bool', df.dtypes['value4'].name)
266266
self.assertEqual('float64', df.dtypes['value5'].name)
267267

@@ -384,7 +384,7 @@ def test_pandas_null_string_types(self):
384384
parser = self._parse(data=data, serialization_mode=FluxSerializationMode.dataFrame,
385385
response_metadata_mode=FluxResponseMetadataMode.full)
386386
df = list(parser.generator())[0]
387-
self.assertEqual('object', df.dtypes['value'].name)
387+
assert df.dtypes['value'].name in ['str', 'object']
388388

389389
def test_pandas_null_string_types_extension_types(self):
390390
data = "#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,string\n" \

tests/test_WriteApi.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,8 @@ def test_redirect(self):
532532
Retry.DEFAULT.remove_headers_on_redirect = Retry.DEFAULT_REMOVE_HEADERS_ON_REDIRECT
533533
self.influxdb_client.close()
534534

535-
self.influxdb_client = InfluxDBClient(url="http://localhost", token="my-token", org="my-org")
535+
retries = Retry(redirect=1, remove_headers_on_redirect=[])
536+
self.influxdb_client = InfluxDBClient(url="http://localhost", token="my-token", org="my-org", retries=retries)
536537

537538
httpretty.register_uri(httpretty.POST, uri="http://localhost2/api/v2/write", status=204)
538539
httpretty.register_uri(httpretty.POST, uri="http://localhost/api/v2/write", status=301,

0 commit comments

Comments
 (0)