[#4060] Refactor partial parsing test to avoid file collisions (#4068)

dbt-labs · Oct 15, 2021 · 80ba716 · 80ba716
1 parent 26625e9
commit 80ba716
Show file tree

Hide file tree

Showing 61 changed files with 161 additions and 288 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## dbt-core 1.0.0 (Release TBD)
 
+### Under the hood
+- Fix intermittent errors in partial parsing tests ([#4060](https:/dbt-labs/dbt-core/issues/4060), [#4068](https:/dbt-labs/dbt-core/pull/4068))
+
 ## dbt-core 1.0.0b1 (October 11, 2021)
 
 ## dbt 1.0.0b1 (October 11, 2021)

diff --git a/test/integration/068_partial_parsing_tests/analyses/.gitignore b/test/integration/068_partial_parsing_tests/analyses/.gitignore
diff --git a/test/integration/068_partial_parsing_tests/macros-b/.gitignore b/test/integration/068_partial_parsing_tests/macros-b/.gitignore
diff --git a/test/integration/068_partial_parsing_tests/macros-docs/my_macro.sql b/test/integration/068_partial_parsing_tests/macros-docs/my_macro.sql
diff --git a/test/integration/068_partial_parsing_tests/macros-macros/.gitignore b/test/integration/068_partial_parsing_tests/macros-macros/.gitignore
diff --git a/test/integration/068_partial_parsing_tests/macros-models/model_a.sql b/test/integration/068_partial_parsing_tests/macros-models/model_a.sql
diff --git a/test/integration/068_partial_parsing_tests/macros-models/model_b.sql b/test/integration/068_partial_parsing_tests/macros-models/model_b.sql
diff --git a/test/integration/068_partial_parsing_tests/macros-models/schema.yml b/test/integration/068_partial_parsing_tests/macros-models/schema.yml
diff --git a/test/integration/068_partial_parsing_tests/macros/.gitignore b/test/integration/068_partial_parsing_tests/macros/.gitignore
diff --git a/test/integration/068_partial_parsing_tests/models-b/model_one.sql b/test/integration/068_partial_parsing_tests/models-b/model_one.sql
diff --git a/test/integration/068_partial_parsing_tests/models-c/model_one.sql b/test/integration/068_partial_parsing_tests/models-c/model_one.sql
diff --git a/test/integration/068_partial_parsing_tests/models-docs/model_one.sql b/test/integration/068_partial_parsing_tests/models-docs/model_one.sql
diff --git a/test/integration/068_partial_parsing_tests/seed-docs/raw_customers.csv b/test/integration/068_partial_parsing_tests/seed-docs/raw_customers.csv
diff --git a/test/integration/068_partial_parsing_tests/seed/.gitignore b/test/integration/068_partial_parsing_tests/seed/.gitignore
diff --git a/test/integration/068_partial_parsing_tests/snapshots-d/.gitignore b/test/integration/068_partial_parsing_tests/snapshots-d/.gitignore
diff --git a/...ests/extra-files/custom_schema_tests1.sql → ...tests/test-files/custom_schema_tests1.sql b/...ests/extra-files/custom_schema_tests1.sql → ...tests/test-files/custom_schema_tests1.sql
diff --git a/...ests/extra-files/custom_schema_tests2.sql → ...tests/test-files/custom_schema_tests2.sql b/...ests/extra-files/custom_schema_tests2.sql → ...tests/test-files/custom_schema_tests2.sql
diff --git a/...l_parsing_tests/extra-files/customers.sql → ...al_parsing_tests/test-files/customers.sql b/...l_parsing_tests/extra-files/customers.sql → ...al_parsing_tests/test-files/customers.sql
diff --git a/...l_parsing_tests/extra-files/customers1.md → ...al_parsing_tests/test-files/customers1.md b/...l_parsing_tests/extra-files/customers1.md → ...al_parsing_tests/test-files/customers1.md
diff --git a/...l_parsing_tests/extra-files/customers2.md → ...al_parsing_tests/test-files/customers2.md b/...l_parsing_tests/extra-files/customers2.md → ...al_parsing_tests/test-files/customers2.md
diff --git a/...arsing_tests/extra-files/empty_schema.yml → ...parsing_tests/test-files/empty_schema.yml b/...arsing_tests/extra-files/empty_schema.yml → ...parsing_tests/test-files/empty_schema.yml
diff --git a/...extra-files/empty_schema_with_version.yml → .../test-files/empty_schema_with_version.yml b/...extra-files/empty_schema_with_version.yml → .../test-files/empty_schema_with_version.yml
diff --git a/...arsing_tests/extra-files/gsm_override.sql → ...parsing_tests/test-files/gsm_override.sql b/...arsing_tests/extra-files/gsm_override.sql → ...parsing_tests/test-files/gsm_override.sql
diff --git a/...rsing_tests/extra-files/gsm_override2.sql → ...arsing_tests/test-files/gsm_override2.sql b/...rsing_tests/extra-files/gsm_override2.sql → ...arsing_tests/test-files/gsm_override2.sql
diff --git a/...tial_parsing_tests/extra-files/macros.yml → ...rtial_parsing_tests/test-files/macros.yml b/...tial_parsing_tests/extra-files/macros.yml → ...rtial_parsing_tests/test-files/macros.yml
diff --git a/...parsing_tests/extra-files/model_four1.sql → ..._parsing_tests/test-files/model_four1.sql b/...parsing_tests/extra-files/model_four1.sql → ..._parsing_tests/test-files/model_four1.sql
diff --git a/...parsing_tests/extra-files/model_four2.sql → ..._parsing_tests/test-files/model_four2.sql b/...parsing_tests/extra-files/model_four2.sql → ..._parsing_tests/test-files/model_four2.sql
diff --git a/...tial_parsing_tests/models-a/model_one.sql → ...al_parsing_tests/test-files/model_one.sql b/...tial_parsing_tests/models-a/model_one.sql → ...al_parsing_tests/test-files/model_one.sql
diff --git a/...parsing_tests/extra-files/model_three.sql → ..._parsing_tests/test-files/model_three.sql b/...parsing_tests/extra-files/model_three.sql → ..._parsing_tests/test-files/model_three.sql
diff --git a/...ests/extra-files/model_three_disabled.sql → ...tests/test-files/model_three_disabled.sql b/...ests/extra-files/model_three_disabled.sql → ...tests/test-files/model_three_disabled.sql
diff --git a/...sts/extra-files/model_three_disabled2.sql → ...ests/test-files/model_three_disabled2.sql b/...sts/extra-files/model_three_disabled2.sql → ...ests/test-files/model_three_disabled2.sql
diff --git a/...ests/extra-files/model_three_modified.sql → ...tests/test-files/model_three_modified.sql b/...ests/extra-files/model_three_modified.sql → ...tests/test-files/model_three_modified.sql
diff --git a/...l_parsing_tests/extra-files/model_two.sql → ...al_parsing_tests/test-files/model_two.sql b/...l_parsing_tests/extra-files/model_two.sql → ...al_parsing_tests/test-files/model_two.sql
diff --git a/...sing_tests/extra-files/models-schema1.yml → ...rsing_tests/test-files/models-schema1.yml b/...sing_tests/extra-files/models-schema1.yml → ...rsing_tests/test-files/models-schema1.yml
diff --git a/...sing_tests/extra-files/models-schema2.yml → ...rsing_tests/test-files/models-schema2.yml b/...sing_tests/extra-files/models-schema2.yml → ...rsing_tests/test-files/models-schema2.yml
diff --git a/...ing_tests/extra-files/models-schema2b.yml → ...sing_tests/test-files/models-schema2b.yml b/...ing_tests/extra-files/models-schema2b.yml → ...sing_tests/test-files/models-schema2b.yml
diff --git a/...sing_tests/extra-files/models-schema3.yml → ...rsing_tests/test-files/models-schema3.yml b/...sing_tests/extra-files/models-schema3.yml → ...rsing_tests/test-files/models-schema3.yml
diff --git a/...parsing_tests/extra-files/my_analysis.sql → ..._parsing_tests/test-files/my_analysis.sql b/...parsing_tests/extra-files/my_analysis.sql → ..._parsing_tests/test-files/my_analysis.sql
diff --git a/...al_parsing_tests/extra-files/my_macro.sql → ...ial_parsing_tests/test-files/my_macro.sql b/...al_parsing_tests/extra-files/my_macro.sql → ...ial_parsing_tests/test-files/my_macro.sql
diff --git a/...l_parsing_tests/extra-files/my_macro2.sql → ...al_parsing_tests/test-files/my_macro2.sql b/...l_parsing_tests/extra-files/my_macro2.sql → ...al_parsing_tests/test-files/my_macro2.sql
diff --git a/...ial_parsing_tests/extra-files/my_test.sql → ...tial_parsing_tests/test-files/my_test.sql b/...ial_parsing_tests/extra-files/my_test.sql → ...tial_parsing_tests/test-files/my_test.sql
diff --git a/...partial_parsing_tests/models-d/orders.sql → ...rtial_parsing_tests/test-files/orders.sql b/...partial_parsing_tests/models-d/orders.sql → ...rtial_parsing_tests/test-files/orders.sql
diff --git a/...rsing_tests/extra-files/raw_customers.csv → ...arsing_tests/test-files/raw_customers.csv b/...rsing_tests/extra-files/raw_customers.csv → ...arsing_tests/test-files/raw_customers.csv
diff --git a/...arsing_tests/extra-files/ref_override.sql → ...parsing_tests/test-files/ref_override.sql b/...arsing_tests/extra-files/ref_override.sql → ...parsing_tests/test-files/ref_override.sql
diff --git a/...rsing_tests/extra-files/ref_override2.sql → ...arsing_tests/test-files/ref_override2.sql b/...rsing_tests/extra-files/ref_override2.sql → ...arsing_tests/test-files/ref_override2.sql
diff --git a/...parsing_tests/extra-files/schema-docs.yml → ..._parsing_tests/test-files/schema-docs.yml b/...parsing_tests/extra-files/schema-docs.yml → ..._parsing_tests/test-files/schema-docs.yml
diff --git a/...arsing_tests/extra-files/schema-docs2.yml → ...parsing_tests/test-files/schema-docs2.yml b/...arsing_tests/extra-files/schema-docs2.yml → ...parsing_tests/test-files/schema-docs2.yml
diff --git a/...ing_tests/extra-files/schema-models-c.yml → ...sing_tests/test-files/schema-models-c.yml b/...ing_tests/extra-files/schema-models-c.yml → ...sing_tests/test-files/schema-models-c.yml
diff --git a/...ing_tests/extra-files/schema-sources1.yml → ...sing_tests/test-files/schema-sources1.yml b/...ing_tests/extra-files/schema-sources1.yml → ...sing_tests/test-files/schema-sources1.yml
diff --git a/...ing_tests/extra-files/schema-sources2.yml → ...sing_tests/test-files/schema-sources2.yml b/...ing_tests/extra-files/schema-sources2.yml → ...sing_tests/test-files/schema-sources2.yml
diff --git a/...ing_tests/extra-files/schema-sources3.yml → ...sing_tests/test-files/schema-sources3.yml b/...ing_tests/extra-files/schema-sources3.yml → ...sing_tests/test-files/schema-sources3.yml
diff --git a/...ing_tests/extra-files/schema-sources4.yml → ...sing_tests/test-files/schema-sources4.yml b/...ing_tests/extra-files/schema-sources4.yml → ...sing_tests/test-files/schema-sources4.yml
diff --git a/...ing_tests/extra-files/schema-sources5.yml → ...sing_tests/test-files/schema-sources5.yml b/...ing_tests/extra-files/schema-sources5.yml → ...sing_tests/test-files/schema-sources5.yml
diff --git a/...al_parsing_tests/extra-files/snapshot.sql → ...ial_parsing_tests/test-files/snapshot.sql b/...al_parsing_tests/extra-files/snapshot.sql → ...ial_parsing_tests/test-files/snapshot.sql
diff --git a/...l_parsing_tests/extra-files/snapshot2.sql → ...al_parsing_tests/test-files/snapshot2.sql b/...l_parsing_tests/extra-files/snapshot2.sql → ...al_parsing_tests/test-files/snapshot2.sql
diff --git a/...sing_tests/extra-files/sources-tests1.sql → ...rsing_tests/test-files/sources-tests1.sql b/...sing_tests/extra-files/sources-tests1.sql → ...rsing_tests/test-files/sources-tests1.sql
diff --git a/...sing_tests/extra-files/sources-tests2.sql → ...rsing_tests/test-files/sources-tests2.sql b/...sing_tests/extra-files/sources-tests2.sql → ...rsing_tests/test-files/sources-tests2.sql