Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Patch inconsistent ordering within GCP test asserts #7130

Merged
merged 10 commits into from
Feb 14, 2023
Merged

[BUGFIX] Patch inconsistent ordering within GCP test asserts #7130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cb20263
fix: use custom sort on asserts
cdkini Feb 13, 2023
c64e5a4
chore: add comment about why we sort
cdkini Feb 13, 2023
0e91765
pushing potential fix
Feb 13, 2023
8c0475e
sorting
Feb 14, 2023
34cec6e
Merge branch 'develop' into b/_/patch_gcp_unexpected_list_sorting_issues
Feb 14, 2023
5427d01
Merge develop into b/_/patch_gcp_unexpected_list_sorting_issues
github-actions[bot] Feb 14, 2023
89c3002
Merge develop into b/_/patch_gcp_unexpected_list_sorting_issues
github-actions[bot] Feb 14, 2023
eb47016
Merge develop into b/_/patch_gcp_unexpected_list_sorting_issues
github-actions[bot] Feb 14, 2023
fceeaa5
Merge develop into b/_/patch_gcp_unexpected_list_sorting_issues
github-actions[bot] Feb 14, 2023
a505651
Merge develop into b/_/patch_gcp_unexpected_list_sorting_issues
github-actions[bot] Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions great_expectations/self_check/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@
IDDict,
)
from great_expectations.core.batch import Batch, BatchDefinition, BatchRequest
from great_expectations.core.expectation_diagnostics.expectation_test_data_cases import (
ExpectationTestCase, # noqa: TCH001
ExpectationTestDataCases, # noqa: TCH001
)
from great_expectations.core.expectation_diagnostics.supporting_types import (
ExpectationExecutionEngineDiagnostics, # noqa: TCH001
)
from great_expectations.core.util import (
get_or_create_spark_application,
get_sql_dialect_floating_point_infinity_value,
Expand Down Expand Up @@ -79,6 +72,13 @@
from great_expectations.validator.validator import Validator

if TYPE_CHECKING:
from great_expectations.core.expectation_diagnostics.expectation_test_data_cases import (
ExpectationTestCase,
ExpectationTestDataCases,
)
from great_expectations.core.expectation_diagnostics.supporting_types import (
ExpectationExecutionEngineDiagnostics,
)
from great_expectations.data_context import AbstractDataContext

expectationValidationResultSchema = ExpectationValidationResultSchema()
Expand Down Expand Up @@ -3064,10 +3064,12 @@ def check_json_test_result( # noqa: C901 - 52
assert result["result"]["observed_value"] in value

elif key == "unexpected_index_list":
if pk_column and result["result"].get("unexpected_index_list"):
unexpected_list = result["result"].get("unexpected_index_list")
if pk_column and unexpected_list:
# Note that consistent ordering of unexpected_list is not a guarantee by ID/PK
assert (
result["result"].get("unexpected_index_list") == value
), f"{result['result'].get('unexpected_index_list')} != {value}"
sorted(unexpected_list, key=lambda d: d["pk_index"]) == value
), f"{unexpected_list} != {value}"

elif key == "unexpected_list":
try:
Expand Down
27 changes: 24 additions & 3 deletions ...ns/column_map_expectations/expect_column_values_to_be_between__evaluation_parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,14 @@
"title": "basic_negative_now_test_other_sql",
"include_in_gallery": true,
"exact_match_out": false,
"suppress_test_for": ["pandas", "spark", "mysql", "mssql", "postgresql"],
"suppress_test_for": [
"pandas",
"spark",
"mysql",
"mssql",
"postgresql",
"bigquery"
],
"out": {
"unexpected_index_list": [{"pk_index": 0, "ts": "1970-01-01 12:00:01"}, {"pk_index": 1, "ts": "1999-12-31 12:00:01"}, {"pk_index": 2, "ts": "2000-01-01 12:00:01"}, {"pk_index": 3, "ts": "2000-02-01 12:00:01"}, {"pk_index": 4, "ts": "2000-03-01 12:00:01"}, {"pk_index": 5, "ts": "2000-04-01 12:00:01"}, {"pk_index": 6, "ts": "2000-05-01 12:00:01"}, {"pk_index": 7, "ts": "2000-06-01 12:00:01"}, {"pk_index": 9, "ts": "2001-01-01 12:00:01"}],
"success": false
Expand Down Expand Up @@ -208,7 +215,14 @@
{
"title": "basic_negative_now_timedelta_test_other_sql",
"exact_match_out": false,
"suppress_test_for": ["pandas", "spark", "postgresql", "mssql", "mysql"],
"suppress_test_for": [
"pandas",
"spark",
"postgresql",
"mssql",
"mysql",
"bigquery"
],
"out": {
"unexpected_index_list": [{"pk_index": 0, "ts": "1970-01-01 12:00:01"}, {"pk_index": 1, "ts": "1999-12-31 12:00:01"}, {"pk_index": 2, "ts": "2000-01-01 12:00:01"}, {"pk_index": 3, "ts": "2000-02-01 12:00:01"}, {"pk_index": 4, "ts": "2000-03-01 12:00:01"}, {"pk_index": 5, "ts": "2000-04-01 12:00:01"}, {"pk_index": 6, "ts": "2000-05-01 12:00:01"}, {"pk_index": 7, "ts": "2000-06-01 12:00:01"}, {"pk_index": 9, "ts": "2001-01-01 12:00:01"}],
"success": false
Expand Down Expand Up @@ -253,7 +267,14 @@
}, {
"title": "basic_negative_datetime_test_other_sql",
"exact_match_out": false,
"suppress_test_for": ["pandas", "spark", "postgresql", "mssql", "mysql"],
"suppress_test_for": [
Comment on lines -256 to +270
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bigquery does not allow for comparison between datetime

"pandas",
"spark",
"postgresql",
"mssql",
"mysql",
"bigquery"
],
"out": {
"success": false,
"unexpected_index_list": [{"pk_index": 0, "ts": "1970-01-01 12:00:01"}, {"pk_index": 1, "ts": "1999-12-31 12:00:01"}, {"pk_index": 2, "ts": "2000-01-01 12:00:01"}, {"pk_index": 3, "ts": "2000-02-01 12:00:01"}, {"pk_index": 4, "ts": "2000-03-01 12:00:01"}, {"pk_index": 5, "ts": "2000-04-01 12:00:01"}, {"pk_index": 6, "ts": "2000-05-01 12:00:01"}, {"pk_index": 7, "ts": "2000-06-01 12:00:01"}, {"pk_index": 9, "ts": "2001-01-01 12:00:01"}]
Expand Down
5 changes: 4 additions & 1 deletion ...t_definitions/column_map_expectations/expect_column_values_to_be_between_tz_informed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,10 @@
},
{
"title": "basic_negative_test_with_timestamps_tz_informed_sql",
"only_for": ["trino", "bigquery","sqlite"] ,
"only_for": [
"trino",
"sqlite"
],
"exact_match_out": false,
"out": {
"unexpected_index_list": [{"pk_index": 0, "ts": "1970-01-01 12:00:01.000000"}, {"pk_index": 8, "ts": "2019-09-01 15:27:05.345678"},
Expand Down
9 changes: 8 additions & 1 deletion ...test_definitions/column_map_expectations/expect_column_values_to_be_between_tz_naive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,14 @@
{
"title": "basic_negative_test_with_timestamps_other_sql",
"exact_match_out": false,
"suppress_test_for": ["pandas", "spark", "postgresql", "mssql", "mysql"],
"suppress_test_for": [
"pandas",
"spark",
"postgresql",
"mssql",
"mysql",
"bigquery"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bigquery does not allow for comparison between datetime

],
"out": {
"unexpected_index_list": [{"ts": "1970-01-01 12:00:01", "pk_index": 0}, {"ts": "2001-01-01 12:00:01", "pk_index": 9}],
"success": false
Expand Down
7 changes: 6 additions & 1 deletion tests/test_definitions/column_map_expectations/expect_column_values_to_be_in_set.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,12 @@
},
"out": {
"success": false,
"unexpected_index_list": [0],
"unexpected_index_list": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated so that the output includes ID/PK

{
"pk_index": 0,
"dates": "2018-01-01"
}
],
"unexpected_list": ["2018-01-01"]
}
}
Expand Down
19 changes: 18 additions & 1 deletion tests/test_definitions/column_map_expectations/expect_column_values_to_be_unique.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,24 @@
"out": {
"success": false,
"unexpected_list": ["None", "None", "None", "None"],
"unexpected_index_list": [0, 1, 2, 3]
"unexpected_index_list": [
{
"pk_index": 0,
"null": "None"
},
{
"pk_index": 1,
"null": "None"
},
{
"pk_index": 2,
"null": "None"
},
{
"pk_index": 3,
"null": "None"
}
]
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions tests/test_definitions/test_expectations_v3_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ def pytest_generate_tests(metafunc): # noqa C901 - 35
validator_with_data.active_batch_data,
SqlAlchemyBatchData,
):
# Call out supported dialects
if "pandas_v3_api" in only_for:
generate_test = True
if "sqlalchemy" in only_for:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a bug. The pandas_v3_api should have been in the if statement that was checking for PandasBatchData.

generate_test = True
elif (
Expand Down Expand Up @@ -208,6 +205,9 @@ def pytest_generate_tests(metafunc): # noqa C901 - 35
validator_with_data.active_batch_data,
PandasBatchData,
):
# Call out supported dialects
if "pandas_v3_api" in only_for:
generate_test = True
major, minor, *_ = pd.__version__.split(".")
if "pandas" in only_for:
generate_test = True
Expand Down