sam/shlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buildah clean

Browse Source
This commit is contained in:
jpic 2020-02-15 17:03:02 +01:00
parent 7806e217ef
commit 884f96013e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shlax/targets/buildah.py
View File

@ -136,7 +136,7 @@ class Buildah(Localhost):
cli.exit_code = await proc.wait() cli.exit_code = await proc.wait()
async def clean(self, *args, **kwargs): async def clean(self, *args, **kwargs):
if self.mnt: if self.mnt is not None:
await self.exec('buildah', 'umount', self.ctr, buildah=False) await self.exec('buildah', 'umount', self.ctr, buildah=False)
if self.ctr: if self.ctr is not None:
await self.exec('buildah', 'rm', self.ctr, buildah=False) await self.exec('buildah', 'rm', self.ctr, buildah=False)

3
tests/test_proc.py
View File

@ -29,6 +29,7 @@ test_args_params = [
('buildah', 'from', 'alpine'), ('buildah', 'from', 'alpine'),
('buildah', 'mount', ''), ('buildah', 'mount', ''),
('buildah', 'run', '', '--', 'sh', '-euc', 'echo hi'), ('buildah', 'run', '', '--', 'sh', '-euc', 'echo hi'),
('buildah', 'umount', ''),
('buildah', 'rm', ''), ('buildah', 'rm', ''),
] ]
), ),
@ -38,6 +39,7 @@ test_args_params = [
('buildah', 'from', 'alpine'), ('buildah', 'from', 'alpine'),
('buildah', 'mount', ''), ('buildah', 'mount', ''),
('buildah', 'run', '--user', 'root', '', '--', 'sh', '-euc', 'echo hi'), ('buildah', 'run', '--user', 'root', '', '--', 'sh', '-euc', 'echo hi'),
('buildah', 'umount', ''),
('buildah', 'rm', ''), ('buildah', 'rm', ''),
] ]
), ),
@ -47,6 +49,7 @@ test_args_params = [
('ssh', 'host', 'buildah', 'from', 'alpine'), ('ssh', 'host', 'buildah', 'from', 'alpine'),
('ssh', 'host', 'buildah', 'mount', ''), ('ssh', 'host', 'buildah', 'mount', ''),
('ssh', 'host', 'buildah', 'run', '--user', 'root', '', '--', 'sh', '-euc', 'echo hi'), ('ssh', 'host', 'buildah', 'run', '--user', 'root', '', '--', 'sh', '-euc', 'echo hi'),
('ssh', 'host', 'buildah', 'umount', ''),
('ssh', 'host', 'buildah', 'rm', ''), ('ssh', 'host', 'buildah', 'rm', ''),
] ]
), ),