From 7e9af1fe351df56528ce0ce8635d27149c3d8909 Mon Sep 17 00:00:00 2001 From: jpic Date: Fri, 31 Jan 2020 21:50:41 +0100 Subject: [PATCH] Fix TEST_REWRITE --- podctl/build.py | 4 +--- tests/test_build.py | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/podctl/build.py b/podctl/build.py index aa0878e..633e260 100644 --- a/podctl/build.py +++ b/podctl/build.py @@ -35,9 +35,7 @@ class BuildScript(Script): if cmd.startswith('sudo '): _cmd = _cmd[5:] - if '\n' in _cmd.strip(): - # 1337: multiline supports, kindof breaks sudo but really fixes cd - _cmd = ' '.join(['bash -eux <<__EOF\n', _cmd, '\n__EOF']) + _cmd = ' '.join(['bash -eux <<__EOF\n', _cmd.strip(), '\n__EOF']) if cmd.startswith('sudo '): return f'buildah run --user root $ctr -- {_cmd}' diff --git a/tests/test_build.py b/tests/test_build.py index 4bc3813..0f005a2 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -27,12 +27,14 @@ def script_test(name, *visitors): f'test_{name}.sh', ) + if os.getenv('TEST_REWRITE') and os.path.exists(path): + os.unlink(path) + if not os.path.exists(path): with open(path, 'w+') as f: f.write(result) raise Exception(f'Fixture created test_{name}.sh') - elif os.getenv('TEST_REWRITE') and os.path.exists(path): - os.unlink(path) + with open(path, 'r') as f: expected = f.read() result = difflib.unified_diff(