diff options
| author | Brett Holman <bpholman5@gmail.com> | 2021-10-07 14:08:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 15:08:13 -0500 |
| commit | 725a7f7f19eb39b472e1f24b447fc9a596bf1748 (patch) | |
| tree | 0fdb2a30b27a7ad06c13b24e8403f6f267d18f5b /cloudinit/tests/test_util.py | |
| parent | fd595774f64f22384ec9229bde176df5cb2fd4c6 (diff) | |
| download | vyos-cloud-init-725a7f7f19eb39b472e1f24b447fc9a596bf1748.tar.gz vyos-cloud-init-725a7f7f19eb39b472e1f24b447fc9a596bf1748.zip | |
Allow comments in runcmd and report failed commands correctly (#1049)
Allow comments in runcmd and report failed commands correctly
A `runcmd` script may fail to parse properly, but does not mark
`runcmd` as failed when that occurs. Additionally `shellify()` fails
to correctly parse scripts that contain a comment line.
Rectify both issues and add unit tests to verify correct behavior.
LP: #1853146
Diffstat (limited to 'cloudinit/tests/test_util.py')
| -rw-r--r-- | cloudinit/tests/test_util.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cloudinit/tests/test_util.py b/cloudinit/tests/test_util.py index 977ad8e0..ab5eb35c 100644 --- a/cloudinit/tests/test_util.py +++ b/cloudinit/tests/test_util.py @@ -349,6 +349,11 @@ class TestShellify(CiTestCase): util.shellify(["echo hi mom", ["echo", "hi dad"], ('echo', 'hi', 'sis')])) + def test_supports_comments(self): + self.assertEqual( + '\n'.join(["#!/bin/sh", "echo start", "echo end", ""]), + util.shellify(["echo start", None, "echo end"])) + class TestGetHostnameFqdn(CiTestCase): |