diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-10-03 12:10:23 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-10-03 12:10:23 -0600 |
| commit | d6347e1c439eda7f43d9620dac2b461e980e1ae9 (patch) | |
| tree | 08410263488d11a2a29edcc620575ed1b028100e /cloudinit/config/tests/test_snap.py | |
| parent | 564793a76b9c9add1ee81bab4919c8dccd45a33d (diff) | |
| parent | e28000457591bde9f22d6b7a538b1fc33349d780 (diff) | |
| download | vyos-cloud-init-d6347e1c439eda7f43d9620dac2b461e980e1ae9.tar.gz vyos-cloud-init-d6347e1c439eda7f43d9620dac2b461e980e1ae9.zip | |
merge from master at 18.4
Diffstat (limited to 'cloudinit/config/tests/test_snap.py')
| -rw-r--r-- | cloudinit/config/tests/test_snap.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cloudinit/config/tests/test_snap.py b/cloudinit/config/tests/test_snap.py index 34c80f1e..3c472891 100644 --- a/cloudinit/config/tests/test_snap.py +++ b/cloudinit/config/tests/test_snap.py @@ -162,6 +162,7 @@ class TestAddAssertions(CiTestCase): class TestRunCommands(CiTestCase): with_logs = True + allowed_subp = [CiTestCase.SUBP_SHELL_TRUE] def setUp(self): super(TestRunCommands, self).setUp() @@ -424,8 +425,10 @@ class TestHandle(CiTestCase): 'snap': {'commands': ['echo "HI" >> %s' % outfile, 'echo "MOM" >> %s' % outfile]}} mock_path = 'cloudinit.config.cc_snap.sys.stderr' - with mock.patch(mock_path, new_callable=StringIO): - handle('snap', cfg=cfg, cloud=None, log=self.logger, args=None) + with self.allow_subp([CiTestCase.SUBP_SHELL_TRUE]): + with mock.patch(mock_path, new_callable=StringIO): + handle('snap', cfg=cfg, cloud=None, log=self.logger, args=None) + self.assertEqual('HI\nMOM\n', util.load_file(outfile)) @mock.patch('cloudinit.config.cc_snap.util.subp') |