Re: [OE-core][PATCH v2 2/2] oeqa: wic: Add tests for --no-fstab-update

["Alexandre Belloni" <alexandre.belloni@bootlin.com>]

Hello,

On 10/08/2021 22:11:01+0200, Daniel Gomez wrote:
> Add tests for the --no-fstab-update wic part command.
> 
> Signed-off-by: Daniel Gomez <daniel@qtec.com>
> ---
>  meta/lib/oeqa/selftest/cases/wic.py | 56 +++++++++++++++++++++++++++++
>  1 file changed, 56 insertions(+)
> 
> diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
> index 2efbe514c1..a58360851a 100644
> --- a/meta/lib/oeqa/selftest/cases/wic.py
> +++ b/meta/lib/oeqa/selftest/cases/wic.py
> @@ -11,6 +11,7 @@
>  import os
>  import sys
>  import unittest
> +import hashlib
>  
>  from glob import glob
>  from shutil import rmtree, copy
> @@ -686,6 +687,61 @@ part /etc --source rootfs --fstype=ext4 --change-directory=etc
>                                        % (wks_file, self.resultdir), ignore_status=True).status)
>          os.remove(wks_file)
>  
> +    def test_no_fstab_update(self):
> +        """Test --no-fstab-update wks option."""
> +
> +        oldpath = os.environ['PATH']
> +        os.environ['PATH'] = get_bb_var("PATH", "wic-tools")
> +
> +        # Get stock fstab from base-files recipe
> +        bitbake('base-files')
> +        bf_fstab = os.path.join(get_bb_var('WORKDIR', 'base-files'),'image/etc/fstab')
> +        bf_fstab_md5sum = runCmd('md5sum %s 2>/dev/null' % bf_fstab).output.split(" ")[0]
> +

This failed on the autobuilders:

  File "/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/lib/oeqa/selftest/cases/wic.py", line 699, in test_no_fstab_update
    bf_fstab_md5sum = runCmd('md5sum %s 2>/dev/null' % bf_fstab).output.split(" ")[0]
  File "/home/pokybuild/yocto-worker/oe-selftest-debian/build/meta/lib/oeqa/utils/commands.py", line 207, in runCmd
    raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output))
AssertionError: Command 'md5sum /home/pokybuild/yocto-worker/oe-selftest-debian/build/build-st-15202/tmp/work/qemux86_64-poky-linux/base-files/3.0.14-r89/image/etc/fstab 2>/dev/null' returned non-zero exit status 1:

Full log here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2374/steps/14/logs/stdio

> +        try:
> +            no_fstab_update_path = os.path.join(self.resultdir, 'test-no-fstab-update')
> +            os.makedirs(no_fstab_update_path)
> +            wks_file = os.path.join(no_fstab_update_path, 'temp.wks')
> +            with open(wks_file, 'w') as wks:
> +                wks.writelines(['part / --source rootfs --fstype=ext4 --label rootfs\n',
> +                                'part /mnt/p2 --source rootfs --rootfs-dir=core-image-minimal ',
> +                                '--fstype=ext4 --label p2 --no-fstab-update\n'])
> +            runCmd("wic create %s -e core-image-minimal -o %s" \
> +                                       % (wks_file, self.resultdir))
> +
> +            part_fstab_md5sum = []
> +            for i in range(1, 3):
> +                part = glob(os.path.join(self.resultdir, 'temp-*.direct.p') + str(i))[0]
> +                part_fstab = runCmd("debugfs -R 'cat etc/fstab' %s 2>/dev/null" % (part))
> +                part_fstab_md5sum.append(hashlib.md5((part_fstab.output + "\n\n").encode('utf-8')).hexdigest())
> +
> +            # '/etc/fstab' in partition 2 should contain the same stock fstab file at base-file recipe.
> +            self.assertEqual(bf_fstab_md5sum, part_fstab_md5sum[1])
> +
> +            # '/etc/fstab' in partition 1 should contain an updated fstab file.
> +            self.assertNotEqual(bf_fstab_md5sum, part_fstab_md5sum[0])
> +
> +        finally:
> +            os.environ['PATH'] = oldpath
> +
> +    def test_no_fstab_update_errors(self):
> +        """Test --no-fstab-update wks option error handling."""
> +        wks_file = 'temp.wks'
> +
> +        # Absolute argument.
> +        with open(wks_file, 'w') as wks:
> +            wks.write("part / --source rootfs --fstype=ext4 --no-fstab-update /etc")
> +        self.assertNotEqual(0, runCmd("wic create %s -e core-image-minimal -o %s" \
> +                                      % (wks_file, self.resultdir), ignore_status=True).status)
> +        os.remove(wks_file)
> +
> +        # Argument pointing to parent directory.
> +        with open(wks_file, 'w') as wks:
> +            wks.write("part / --source rootfs --fstype=ext4 --no-fstab-update ././..")
> +        self.assertNotEqual(0, runCmd("wic create %s -e core-image-minimal -o %s" \
> +                                      % (wks_file, self.resultdir), ignore_status=True).status)
> +        os.remove(wks_file)
> +
>  class Wic2(WicTestCase):
>  
>      def test_bmap_short(self):
> -- 
> 2.30.2
> 



-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com