Skip to content

Commit

Permalink
Merge pull request #1635 from GoogleCloudPlatform/jccb/fast-tests
Browse files Browse the repository at this point in the history
Silence FAST tests warnings
  • Loading branch information
juliocc committed Aug 29, 2023
2 parents c558d9b + 3d487c8 commit 264ee31
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions fast/stages/1-resman/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ The first set of default tags cannot be overridden and defines the following key

The second set is optional and allows defining a custom tag hierarchy, including IAM bindings that can refer to specific identities, or to the internally defined automation service accounts via their names, like in the following example:

```hcl
```tfvars
tags = {
my-custom-tag = {
values = {
Expand Down Expand Up @@ -258,7 +258,7 @@ classDiagram

This is an example that shows how to populate the relevant variables.

```hcl
```tfvars
tenants = {
tn0 = {
admin_group_email = "tn-0-admins@tenant.example.org"
Expand Down
7 changes: 6 additions & 1 deletion tests/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ def plan_summary(module_path, basedir, tf_var_files=None, extra_files=None,
# extract planned outputs
outputs = plan.get('planned_values', {}).get('outputs', {})

# force the destruction of the tftest object, otherwise pytest
# will complain about unraisable exceptions caused by the context
# manager deleting temporary files, including the extra_files that
# tftest tries to remove on cleanup
del tf

return PlanSummary(values, dict(counts), outputs)


Expand All @@ -148,7 +154,6 @@ def inner(module_path, basedir=None, tf_var_files=None, extra_files=None,
**tf_vars):
if basedir is None:
basedir = Path(request.fspath).parent
print(f"{basedir=}")
return plan_summary(module_path=module_path, basedir=basedir,
tf_var_files=tf_var_files, extra_files=extra_files,
**tf_vars)
Expand Down

0 comments on commit 264ee31

Please sign in to comment.