diff options
| author | Daniel Silverstone <dsilvers+gitlab@digital-scurf.org> | 2021-05-30 15:32:36 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers+gitlab@digital-scurf.org> | 2021-05-30 15:32:36 +0000 |
| commit | d990af7543a865f29f413cf951b2838c72b57d46 (patch) | |
| tree | 9dea0073d477a93d9252d3e1f5b7763114f06d16 | |
| parent | d42b00a6a1d2499d038ae9ddbb1fc5703e1927f9 (diff) | |
| parent | c85462eba63f280367fa63a51374b12cdec460b7 (diff) | |
| download | subplot-d990af7543a865f29f413cf951b2838c72b57d46.tar.gz | |
Merge branch 'cleanups' into 'main'
fix: unset environment variables
See merge request subplot/subplot!172
| -rw-r--r-- | share/bash/template/template.sh.tera | 2 | ||||
| -rw-r--r-- | share/python/lib/files.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/bash/template/template.sh.tera b/share/bash/template/template.sh.tera index 5e92371..79e7a15 100644 --- a/share/bash/template/template.sh.tera +++ b/share/bash/template/template.sh.tera @@ -124,7 +124,7 @@ scenario_{{ loop.index }}() { # contains newlines. envnames() { - env -0 | xargs -0 -n1 -i'{}' sh -c "printf '%s\n' '{}' | head -n1 | sed 's/=.*//'" + python3 -c 'import os, sys; sys.stdout.write("".join("%s\n" % key for key in os.environ))' } # Unset all environment variables. At the beginning of each scenario, diff --git a/share/python/lib/files.py b/share/python/lib/files.py index 66ec4d0..0d622d7 100644 --- a/share/python/lib/files.py +++ b/share/python/lib/files.py @@ -171,7 +171,7 @@ def files_remember_metadata(ctx, filename=None): # Check that current metadata of a file is as stored in the context. def files_has_remembered_metadata(ctx, filename=None): - assert_eq = globals()["assert_eq"] + assert_dict_eq = globals()["assert_dict_eq"] log_value = globals()["log_value"] meta = _files_remembered(ctx) @@ -179,7 +179,7 @@ def files_has_remembered_metadata(ctx, filename=None): log_value("meta", 1, meta) log_value("ctx", 1, ctx.as_dict()) - assert_eq(meta[filename], _files_get_metadata(filename)) + assert_dict_eq(meta[filename], _files_get_metadata(filename)) def files_has_different_metadata(ctx, filename=None): |