<div dir="ltr">I'm wondering what the point of checking the output of mount is. If we're just checking that the image booted then the grep is sufficient right?<div><br></div><div>Ross</div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, 11 Jan 2019 at 09:22, Kang Kai <<a href="mailto:Kai.Kang@windriver.com">Kai.Kang@windriver.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">On 2019/1/4 上午10:49, <a href="mailto:kai.kang@windriver.com" target="_blank">kai.kang@windriver.com</a> wrote:<br>
> From: Kai Kang <<a href="mailto:kai.kang@windriver.com" target="_blank">kai.kang@windriver.com</a>><br>
><br>
> It checks output of mount in wic test case test_qemu. But the outputs are<br>
> different between sysvinit and systemd. Add assertion for systemd.<br>
><br>
> Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com" target="_blank">kai.kang@windriver.com</a>><br>
> ---<br>
> meta/lib/oeqa/selftest/cases/wic.py | 5 ++++-<br>
> 1 file changed, 4 insertions(+), 1 deletion(-)<br>
><br>
> diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py<br>
> index 36ee5e5a14..a6bc566166 100644<br>
> --- a/meta/lib/oeqa/selftest/cases/wic.py<br>
> +++ b/meta/lib/oeqa/selftest/cases/wic.py<br>
> @@ -627,7 +627,10 @@ class Wic2(WicTestCase):<br>
> with runqemu('wic-image-minimal', ssh=False) as qemu:<br>
> cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' ' | sort"<br>
> status, output = qemu.run_serial(cmd)<br>
> - self.assertEqual(output, '/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /media\r\n/dev/sda4 /mnt')<br>
> + if 'sysvinit' in get_bb_var('DISTRO_FEATURES'):<br>
> + self.assertEqual(output, '/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /media\r\n/dev/sda4 /mnt')<br>
> + else:<br>
> + self.assertEqual(output, '/dev/sda1 /boot\r\n/dev/sda2 /\r\n/dev/sda3 /media\r\n/dev/sda4 /mnt')<br>
> cmd = "grep UUID= /etc/fstab"<br>
> status, output = qemu.run_serial(cmd)<br>
> self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))<br>
<br>
<br>
Ping<br>
<br>
-- <br>
Kai Kang<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>