From 7cca02cf01b75ed3545727fe331ace39f26ce07e Mon Sep 17 00:00:00 2001 From: Jon Hagg Date: Thu, 21 Jan 2021 11:53:33 -0800 Subject: [PATCH 1/2] test: remove index column from test assertion --- powersimdata/data_access/tests/test_execute_csv.py | 2 +- powersimdata/data_access/tests/test_scenario_csv.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/powersimdata/data_access/tests/test_execute_csv.py b/powersimdata/data_access/tests/test_execute_csv.py index 618ad71ee..674ee1bef 100644 --- a/powersimdata/data_access/tests/test_execute_csv.py +++ b/powersimdata/data_access/tests/test_execute_csv.py @@ -37,5 +37,5 @@ def test_get_execute_file_from_server_type(execute_table): @pytest.mark.integration @pytest.mark.ssh def test_get_execute_file_from_server_header(execute_table): - header = ["id", "status"] + header = ["status"] assert_array_equal(execute_table.columns, header) diff --git a/powersimdata/data_access/tests/test_scenario_csv.py b/powersimdata/data_access/tests/test_scenario_csv.py index b0363f524..701088773 100644 --- a/powersimdata/data_access/tests/test_scenario_csv.py +++ b/powersimdata/data_access/tests/test_scenario_csv.py @@ -30,7 +30,6 @@ def test_get_scenario_file_from_server_type(data_access, scenario_table): @pytest.mark.ssh def test_get_scenario_file_from_server_header(data_access, scenario_table): header = [ - "id", "plan", "name", "state", From 2a53d51dcd43ee6c83fa9d49317d92896c9082d7 Mon Sep 17 00:00:00 2001 From: Jon Hagg Date: Thu, 21 Jan 2021 12:05:34 -0800 Subject: [PATCH 2/2] test: assert id is the index --- powersimdata/data_access/tests/test_execute_csv.py | 1 + powersimdata/data_access/tests/test_scenario_csv.py | 1 + 2 files changed, 2 insertions(+) diff --git a/powersimdata/data_access/tests/test_execute_csv.py b/powersimdata/data_access/tests/test_execute_csv.py index 674ee1bef..9f8809116 100644 --- a/powersimdata/data_access/tests/test_execute_csv.py +++ b/powersimdata/data_access/tests/test_execute_csv.py @@ -39,3 +39,4 @@ def test_get_execute_file_from_server_type(execute_table): def test_get_execute_file_from_server_header(execute_table): header = ["status"] assert_array_equal(execute_table.columns, header) + assert "id" == execute_table.index.name diff --git a/powersimdata/data_access/tests/test_scenario_csv.py b/powersimdata/data_access/tests/test_scenario_csv.py index 701088773..18f0b6ae9 100644 --- a/powersimdata/data_access/tests/test_scenario_csv.py +++ b/powersimdata/data_access/tests/test_scenario_csv.py @@ -47,6 +47,7 @@ def test_get_scenario_file_from_server_header(data_access, scenario_table): "infeasibilities", ] assert_array_equal(scenario_table.columns, header) + assert "id" == scenario_table.index.name @pytest.mark.integration