Restructurize test files

StackGuardian · Oct 24, 2023 · 4584bda · 4584bda
1 parent 008d13c
commit 4584bda
Show file tree

Hide file tree

Showing 26 changed files with 8 additions and 7 deletions.
diff --git a/...nt_config_refers_to_s3_bucket.tirith.json → ...nt_config_refers_to_s3_bucket.tirith.json b/...nt_config_refers_to_s3_bucket.tirith.json → ...nt_config_refers_to_s3_bucket.tirith.json
diff --git a/...res/elb_references_to_secroup.tirith.json → ...res/elb_references_to_secroup.tirith.json b/...res/elb_references_to_secroup.tirith.json → ...res/elb_references_to_secroup.tirith.json
diff --git a/..._references/fixtures/elb_with_secgroup.tf → ...raform_plan/fixtures/elb_with_secgroup.tf b/..._references/fixtures/elb_with_secgroup.tf → ...raform_plan/fixtures/elb_with_secgroup.tf
diff --git a/...erences/fixtures/extra_elb_no_secgroup.tf → ...rm_plan/fixtures/extra_elb_no_secgroup.tf b/...erences/fixtures/extra_elb_no_secgroup.tf → ...rm_plan/fixtures/extra_elb_no_secgroup.tf
diff --git a/...ures/fail_s3_referenced_by_to.tirith.json → ...ures/fail_s3_referenced_by_to.tirith.json b/...ures/fail_s3_referenced_by_to.tirith.json → ...ures/fail_s3_referenced_by_to.tirith.json
diff --git a/tests/providers/terraform_plan/input.json → ...viders/terraform_plan/fixtures/input.json b/tests/providers/terraform_plan/input.json → ...viders/terraform_plan/fixtures/input.json
diff --git a/...rs/terraform_plan/input_aws_instance.json → ...orm_plan/fixtures/input_aws_instance.json b/...rs/terraform_plan/input_aws_instance.json → ...orm_plan/fixtures/input_aws_instance.json
diff --git a/...orm_plan/input_implicit_elb_secgroup.json → ...fixtures/input_implicit_elb_secgroup.json b/...orm_plan/input_implicit_elb_secgroup.json → ...fixtures/input_implicit_elb_secgroup.json
diff --git a/...erraform_plan/input_instance_deps_s3.json → ...plan/fixtures/input_instance_deps_s3.json b/...erraform_plan/input_instance_deps_s3.json → ...plan/fixtures/input_instance_deps_s3.json
diff --git a/...ders/terraform_plan/input_s3_destroy.json → ...aform_plan/fixtures/input_s3_destroy.json b/...ders/terraform_plan/input_s3_destroy.json → ...aform_plan/fixtures/input_s3_destroy.json
diff --git a/...rs/terraform_plan/input_vnet_destroy.json → ...orm_plan/fixtures/input_vnet_destroy.json b/...rs/terraform_plan/input_vnet_destroy.json → ...orm_plan/fixtures/input_vnet_destroy.json
diff --git a/...erraform_plan/input_vnet_destroy_new.json → ...plan/fixtures/input_vnet_destroy_new.json b/...erraform_plan/input_vnet_destroy_new.json → ...plan/fixtures/input_vnet_destroy_new.json
diff --git a/tests/providers/terraform_plan/policy.json → ...iders/terraform_plan/fixtures/policy.json b/tests/providers/terraform_plan/policy.json → ...iders/terraform_plan/fixtures/policy.json
diff --git a/...s/terraform_plan/policy_aws_instance.json → ...rm_plan/fixtures/policy_aws_instance.json b/...s/terraform_plan/policy_aws_instance.json → ...rm_plan/fixtures/policy_aws_instance.json
diff --git a/...raform_plan/policy_ec2_depends_on_s3.json → ...an/fixtures/policy_ec2_depends_on_s3.json b/...raform_plan/policy_ec2_depends_on_s3.json → ...an/fixtures/policy_ec2_depends_on_s3.json
diff --git a/...m_plan/policy_elb_secgroup_reference.json → ...xtures/policy_elb_secgroup_reference.json b/...m_plan/policy_elb_secgroup_reference.json → ...xtures/policy_elb_secgroup_reference.json
diff --git a/...ers/terraform_plan/policy_s3_destroy.json → ...form_plan/fixtures/policy_s3_destroy.json b/...ers/terraform_plan/policy_s3_destroy.json → ...form_plan/fixtures/policy_s3_destroy.json
diff --git a/...s/terraform_plan/policy_vnet_destroy.json → ...rm_plan/fixtures/policy_vnet_destroy.json b/...s/terraform_plan/policy_vnet_destroy.json → ...rm_plan/fixtures/policy_vnet_destroy.json
diff --git a/...rraform_plan/policy_vnet_destroy_new.json → ...lan/fixtures/policy_vnet_destroy_new.json b/...rraform_plan/policy_vnet_destroy_new.json → ...lan/fixtures/policy_vnet_destroy_new.json
diff --git a/...bucket_not_all_has_intelligent_tiering.tf → ...bucket_not_all_has_intelligent_tiering.tf b/...bucket_not_all_has_intelligent_tiering.tf → ...bucket_not_all_has_intelligent_tiering.tf
diff --git a/...bucket_with_intelligent_tiering_config.tf → ...bucket_with_intelligent_tiering_config.tf b/...bucket_with_intelligent_tiering_config.tf → ...bucket_with_intelligent_tiering_config.tf
diff --git a/...by_intelligent_tiering_config.tirith.json → ...by_intelligent_tiering_config.tirith.json b/...by_intelligent_tiering_config.tirith.json → ...by_intelligent_tiering_config.tirith.json
diff --git a/...iering_config_err_tolerance_1.tirith.json → ...iering_config_err_tolerance_1.tirith.json b/...iering_config_err_tolerance_1.tirith.json → ...iering_config_err_tolerance_1.tirith.json
diff --git a/...rect_references/test_direct_references.py → .../terraform_plan/test_direct_references.py b/...rect_references/test_direct_references.py → .../terraform_plan/test_direct_references.py
diff --git a/tests/providers/terraform_plan/test_terraform_plan.py b/tests/providers/terraform_plan/test_terraform_plan.py
@@ -1,13 +1,7 @@
-import json
-import os
 import pytest
 
 from tirith.providers.terraform_plan import handler
-
-
-def load_terraform_plan_json(json_path):
-    with open(f"{os.path.dirname(os.path.abspath(__file__))}/{json_path}", "r") as fp:
-        return json.load(fp)
+from utils import load_terraform_plan_json
 
 
 input_data = load_terraform_plan_json("input.json")

diff --git a/tests/providers/terraform_plan/utils.py b/tests/providers/terraform_plan/utils.py
@@ -0,0 +1,7 @@
+import json
+import os
+
+
+def load_terraform_plan_json(json_path):
+    with open(f"{os.path.dirname(os.path.abspath(__file__))}/fixtures/{json_path}", "r") as fp:
+        return json.load(fp)