Skip to content

Commit

Permalink
TEST-modin-project#2290: remove duplicated tests
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Myskov <alexander.myskov@intel.com>
  • Loading branch information
amyskov committed Dec 1, 2020
1 parent e4d45e9 commit f12b7b8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 76 deletions.
71 changes: 0 additions & 71 deletions modin/pandas/test/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -1105,21 +1105,6 @@ def test_from_sas():
df_equals(modin_df, pandas_df)


@pytest.mark.parametrize("nrows", [123, None])
def test_from_csv(make_csv_file, nrows):
make_csv_file()

pandas_df = pandas.read_csv(TEST_CSV_FILENAME, nrows=nrows)
modin_df = pd.read_csv(TEST_CSV_FILENAME, nrows=nrows)

df_equals(modin_df, pandas_df)

pandas_df = pandas.read_csv(Path(TEST_CSV_FILENAME), nrows=nrows)
modin_df = pd.read_csv(Path(TEST_CSV_FILENAME), nrows=nrows)

df_equals(modin_df, pandas_df)


@pytest.mark.parametrize("nrows", [123, None])
def test_from_csv_sep_none(make_csv_file, nrows):
make_csv_file()
Expand Down Expand Up @@ -1434,53 +1419,6 @@ def test_from_csv_chunksize(make_csv_file):
df_equals(modin_df, pd_df)


@pytest.mark.parametrize("nrows", [1, 2, 123, None])
def test_from_csv_skiprows(make_csv_file, nrows):
make_csv_file()

pandas_df = pandas.read_csv(TEST_CSV_FILENAME, skiprows=2, nrows=nrows)
modin_df = pd.read_csv(TEST_CSV_FILENAME, skiprows=2, nrows=nrows)
df_equals(modin_df, pandas_df)

pandas_df = pandas.read_csv(
TEST_CSV_FILENAME, names=["c1", "c2", "c3", "c4"], skiprows=2, nrows=nrows
)
modin_df = pd.read_csv(
TEST_CSV_FILENAME, names=["c1", "c2", "c3", "c4"], skiprows=2, nrows=nrows
)
df_equals(modin_df, pandas_df)

pandas_df = pandas.read_csv(
TEST_CSV_FILENAME,
header=None,
names=["c1", "c2", "c3", "c4"],
skiprows=2,
nrows=nrows,
)
modin_df = pd.read_csv(
TEST_CSV_FILENAME,
header=None,
names=["c1", "c2", "c3", "c4"],
skiprows=2,
nrows=nrows,
)
df_equals(modin_df, pandas_df)

pandas_df = pandas.read_csv(
TEST_CSV_FILENAME,
names=["c1", "c2", "c3", "c4"],
skiprows=lambda x: x % 2,
nrows=nrows,
)
modin_df = pd.read_csv(
TEST_CSV_FILENAME,
names=["c1", "c2", "c3", "c4"],
skiprows=lambda x: x % 2,
nrows=nrows,
)
df_equals(modin_df, pandas_df)


@pytest.mark.parametrize("names", [list("XYZ"), None])
@pytest.mark.parametrize("skiprows", [1, 2, 3, 4, None])
def test_from_csv_skiprows_names(names, skiprows):
Expand Down Expand Up @@ -1524,15 +1462,6 @@ def test_from_csv_index_col(make_csv_file, nrows):
df_equals(modin_df, pandas_df)


def test_from_csv_skipfooter(make_csv_file):
make_csv_file()

pandas_df = pandas.read_csv(TEST_CSV_FILENAME, skipfooter=13)
modin_df = pd.read_csv(TEST_CSV_FILENAME, skipfooter=13)

df_equals(modin_df, pandas_df)


def test_from_csv_parse_dates(make_csv_file):
make_csv_file(force=True)

Expand Down
10 changes: 5 additions & 5 deletions modin/pandas/test/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -884,15 +884,15 @@ def make_dict_hash(dict_to_hash):

def _make_hash(object_to_hash):
if isinstance(object_to_hash, (set, list)):
new_object = hash(frozenset(object_to_hash))
object_hash = hash(frozenset(object_to_hash))
elif not isinstance(object_to_hash, dict):
new_object = hash(object_to_hash)
object_hash = hash(object_to_hash)
elif callable(object_to_hash):
new_object = hash(object_to_hash.__name__)
object_hash = hash(object_to_hash.__name__)
else:
new_object = object_to_hash
object_hash = object_to_hash

return new_object
return object_hash

new_dict = {key: _make_hash(value) for key, value in dict_to_hash.items()}
return hash(frozenset(new_dict))
Expand Down

0 comments on commit f12b7b8

Please sign in to comment.