Skip to content

Commit 38f91f2

Browse files
author
Christopher Rabotin
committed
Fixed assertion test to account for item order in list.
1 parent 897c27d commit 38f91f2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

influxdb/helper.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Helper class for InfluxDB
44
"""
55
from collections import namedtuple, defaultdict
6+
import six
67

78
class SeriesHelper(object):
89
'''

tests/influxdb/helper_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def testSingleSeriesName(self):
3737
'name': 'events.stats.us.east-1',
3838
'columns': ['time', 'server_name']}]
3939
rcvd = TestSeriesHelper.MySeriesHelper._json_body_()
40-
self.assertListEqual(rcvd, expectation, 'Invalid JSON body of time series returned from _json_body_ for one series name: {}.'.format(rcvd))
40+
self.assertTrue(all([el in expectation for el in rcvd]) and all([el in rcvd for el in expectation]), 'Invalid JSON body of time series returned from _json_body_ for one series name: {}.'.format(rcvd))
4141
TestSeriesHelper.MySeriesHelper._reset_()
4242
self.assertEqual(TestSeriesHelper.MySeriesHelper._json_body_(), [], 'Resetting helper did not empty datapoints.')
4343

@@ -62,7 +62,7 @@ def testSeveralSeriesNames(self):
6262
'name': 'events.stats.us.east-1',
6363
'columns': ['time', 'server_name']}]
6464
rcvd = TestSeriesHelper.MySeriesHelper._json_body_()
65-
self.assertListEqual(rcvd, expectation, 'Invalid JSON body of time series returned from _json_body_ for several series names: {}.'.format(rcvd))
65+
self.assertTrue(all([el in expectation for el in rcvd]) and all([el in rcvd for el in expectation]), 'Invalid JSON body of time series returned from _json_body_ for several series names: {}.'.format(rcvd))
6666
TestSeriesHelper.MySeriesHelper._reset_()
6767
self.assertEqual(TestSeriesHelper.MySeriesHelper._json_body_(), [], 'Resetting helper did not empty datapoints.')
6868

0 commit comments

Comments
 (0)