third_codes/eland
1
0
Fork 0
mirror of https://github.com/elastic/eland.git synced 2025-07-11 00:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing addition repr test for python 3.5. (#100)

Browse Source
This commit is contained in:
stevedodson 2019-12-12 15:57:52 +01:00 committed by GitHub
parent a5380813a7
commit bdaea4658c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eland/tests/dataframe/test_repr_pytest.py
View File

@ -29,6 +29,19 @@ class TestDataFrameRepr(TestData):
# conftest.py changes this default - restore to original setting # conftest.py changes this default - restore to original setting
pd.set_option('display.max_rows', 60) pd.set_option('display.max_rows', 60)
# Override these methods as:
# {'lat': '-33.94609833', 'lon': '151.177002'} order is not consistent in python 3.5 (dict's not ordered)
# remove from test for now
def ed_flights(self):
if not PY36:
return super().ed_flights().drop(columns=['OriginLocation', 'DestLocation'])
return super().ed_flights()
def pd_flights(self):
if not PY36:
return super().pd_flights().drop(columns=['OriginLocation', 'DestLocation'])
return super().pd_flights()
""" """
to_string to_string
""" """
@ -52,14 +65,8 @@ class TestDataFrameRepr(TestData):
self.num_rows_to_string(100, 200, 200) self.num_rows_to_string(100, 200, 200)
def num_rows_to_string(self, rows, max_rows_eland=None, max_rows_pandas=None): def num_rows_to_string(self, rows, max_rows_eland=None, max_rows_pandas=None):
# {'lat': '-33.94609833', 'lon': '151.177002'} order is not consistent in python 3.5 (dict's not ordered) ed_flights = self.ed_flights()
# remove from test for now pd_flights = self.pd_flights()
if not PY36:
ed_flights = self.ed_flights().drop(columns=['OriginLocation', 'DestLocation'])
pd_flights = self.pd_flights().drop(columns=['OriginLocation', 'DestLocation'])
else:
ed_flights = self.ed_flights()
pd_flights = self.pd_flights()
ed_head = ed_flights.head(rows) ed_head = ed_flights.head(rows)
pd_head = pd_flights.head(rows) pd_head = pd_flights.head(rows)
@ -86,9 +93,6 @@ class TestDataFrameRepr(TestData):
""" """
def test_num_rows_repr(self): def test_num_rows_repr(self):
ed_flights = self.ed_flights()
pd_flights = self.pd_flights()
self.num_rows_repr(pd.get_option('display.max_rows') - 1, pd.get_option('display.max_rows') - 1) self.num_rows_repr(pd.get_option('display.max_rows') - 1, pd.get_option('display.max_rows') - 1)
self.num_rows_repr(pd.get_option('display.max_rows'), pd.get_option('display.max_rows')) self.num_rows_repr(pd.get_option('display.max_rows'), pd.get_option('display.max_rows'))
self.num_rows_repr(pd.get_option('display.max_rows') + 1, pd.get_option('display.min_rows')) self.num_rows_repr(pd.get_option('display.max_rows') + 1, pd.get_option('display.min_rows'))