Skip to content

Commit

Permalink
Updated extra columns field name in tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pineapple-cat
pineapple-cat committed Apr 22, 2024
1 parent 8f1bab1 commit 03d95cb
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions post-processing/test_post_processing.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"fake_column": "int",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except KeyError as e:
assert e.args[1] == ["fake_column"]
else:
Expand All @@ -258,7 +258,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"tasks": "int",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except KeyError as e:
assert e.args[1] == "!!"
else:
Expand All @@ -279,7 +279,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"tasks": "int",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except ValueError:
assert True
else:
Expand All @@ -300,7 +300,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"tasks": "int",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except pd.errors.EmptyDataError:
assert True
else:
Expand All @@ -320,7 +320,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"tasks": "int",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except RuntimeError:
assert True
else:
Expand All @@ -340,7 +340,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"tasks": "int",
"cpus_per_task": "int",
"extra_param": "int"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except RuntimeError as e:
# three param columns found in changed log
EXPECTED_FIELDS = ["tasks", "cpus_per_task", "extra_param"]
Expand All @@ -363,7 +363,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"job_completion_time": "datetime",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
# check returned subset is as expected
assert len(df) == 2

Expand All @@ -382,7 +382,7 @@ def test_high_level_script(run_sombrero):
"cpus_per_task": "int",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
# check returned subset is as expected
assert len(df) == 4

Expand All @@ -403,7 +403,7 @@ def test_high_level_script(run_sombrero):
"flops_unit": "str",
"cpus_per_task": "int",
"OMP_NUM_THREADS": "int"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
# check flops values are halved compared to previous df
assert (dfs["flops_value"].values == df[df["cpus_per_task"] == 2]["flops_value"].values/2).all()

Expand All @@ -423,7 +423,7 @@ def test_high_level_script(run_sombrero):
"flops_value": "float",
"flops_unit": "str",
"cpus_per_task": "int"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
assert (dfs[dfs["cpus_per_task"] == 1]["flops_value"].values ==
df[df["cpus_per_task"] == 1]["flops_value"].values /
df[df["cpus_per_task"] == 1]["flops_value"].values).all()
Expand All @@ -448,7 +448,7 @@ def test_high_level_script(run_sombrero):
"flops_value": "float",
"flops_unit": "str",
"cpus_per_task": "int"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
assert (dfs["flops_value"].values == df["flops_value"].values /
df[(df["cpus_per_task"] == 1) & (df["tasks"] == 2)]["flops_value"].iloc[0]).all()

Expand All @@ -468,7 +468,7 @@ def test_high_level_script(run_sombrero):
"flops_value": "float",
"flops_unit": "str",
"cpus_per_task": "int"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
# check flops values are halved compared to previous df
assert (dfs["flops_value"].values == df[df["cpus_per_task"] == 2]["flops_value"].values/2).all()

Expand All @@ -489,7 +489,7 @@ def test_high_level_script(run_sombrero):
"flops_unit": "str",
"cpus_per_task": "int",
"OMP_NUM_THREADS": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except TypeError:
assert True

Expand All @@ -510,7 +510,7 @@ def test_high_level_script(run_sombrero):
"flops_value": "float",
"flops_unit": "str",
"cpus_per_task": "int"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except ValueError:
assert True

Expand All @@ -529,7 +529,7 @@ def test_high_level_script(run_sombrero):
"column_types": {"tasks": "int",
"flops_value": "float",
"flops_unit": "str"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))
except RuntimeError as e:
# dataframe has records from both files
assert len(e.args[1]) == 8
Expand All @@ -551,7 +551,7 @@ def test_high_level_script(run_sombrero):
"flops_value": "float",
"flops_unit": "str",
"cpus_per_task": "int"},
"additional_columns_to_csv": []}))
"extra_columns_to_csv": []}))

EXPECTED_FIELDS = ["tasks", "flops_value", "flops_unit"]
# check returned subset is as expected
Expand All @@ -573,7 +573,7 @@ def test_high_level_script(run_sombrero):
"flops_value": "float",
"flops_unit": "str",
"cpus_per_task": "int"},
"additional_columns_to_csv": ["spack_spec"]}
"extra_columns_to_csv": ["spack_spec"]}
))

EXPECTED_FIELDS = ["tasks", "flops_value", "flops_unit"]
Expand Down Expand Up @@ -603,7 +603,7 @@ def test_high_level_script(run_sombrero):
"flops_value": "float",
"flops_unit": "str",
"cpus_per_task": "int"},
"additional_columns_to_csv": ["tasks", "tasks"]}
"extra_columns_to_csv": ["tasks", "tasks"]}
))

EXPECTED_FIELDS = ["tasks", "flops_value", "flops_unit"]
Expand Down

0 comments on commit 03d95cb

Please sign in to comment.