Re: [PATCH v6 10/10] oeqa: wic: Add more tests for include_path

["Paul Barker" <pbarker@konsulko.com>]

On Tue, 14 Apr 2020 15:36:14 +0200
Ricardo Ribalda Delgado <ricardo@ribalda.com> wrote:

> Make sure permissions are respected.
> 
> Add new test for orig/destination option.
> 
> Cc: Paul Barker <pbarker@konsulko.com>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
> ---
>  meta/lib/oeqa/selftest/cases/wic.py | 64 ++++++++++++++++++++++++++++-
>  1 file changed, 63 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
> index 8ef08c3d77..1036269b64 100644
> --- a/meta/lib/oeqa/selftest/cases/wic.py
> +++ b/meta/lib/oeqa/selftest/cases/wic.py
> @@ -486,15 +486,77 @@ part /part2 --source rootfs --ondisk mmcblk0 --fstype=ext4 --include-path %s"""
>              res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part1))
>              files = extract_files(res.output)
>              self.assertNotIn('test-file', files)
> +            self.assertEqual(True, files_own_by_root(res.output))
>  
> -            # Test partition 2, should not contain 'test-file'
> +            # Test partition 2, should contain 'test-file'
>              res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part2))
>              files = extract_files(res.output)
>              self.assertIn('test-file', files)
> +            self.assertEqual(True, files_own_by_root(res.output))
>  
>          finally:
>              os.environ['PATH'] = oldpath
>  
> +    def test_include_path_embeded(self):
> +        """Test --include-path wks option."""
> +
> +        oldpath = os.environ['PATH']
> +        os.environ['PATH'] = get_bb_var("PATH", "wic-tools")
> +
> +        try:
> +            include_path = os.path.join(self.resultdir, 'test-include')
> +            os.makedirs(include_path)
> +            with open(os.path.join(include_path, 'test-file'), 'w') as t:
> +                t.write("test\n")
> +            wks_file = os.path.join(include_path, 'temp.wks')
> +            with open(wks_file, 'w') as wks:
> +                rootfs_dir = get_bb_var('IMAGE_ROOTFS', 'core-image-minimal')
> +                wks.write("""
> +part / --source rootfs  --fstype=ext4 --include-path %s --include-path core-image-minimal-mtdutils export/"""
> +                          % (include_path))
> +            runCmd("wic create %s -e core-image-minimal -o %s" \
> +                                       % (wks_file, self.resultdir))
> +
> +            part1 = glob(os.path.join(self.resultdir, 'temp-*.direct.p1'))[0]
> +
> +            res = runCmd("debugfs -R 'ls -p' %s 2>/dev/null" % (part1))
> +            files = extract_files(res.output)
> +            self.assertIn('test-file', files)
> +            self.assertEqual(True, files_own_by_root(res.output))
> +
> +            res = runCmd("debugfs -R 'ls -p /export/etc/' %s 2>/dev/null" % (part1))
> +            files = extract_files(res.output)
> +            self.assertIn('shadow', files)

This fails if `shadow` isn't part of the image:

2020-04-18 21:00:01,411 - oe-selftest - INFO - test_include_path_embeded (wic.Wic)
2020-04-18 21:00:14,102 - oe-selftest - INFO -  ... FAIL
2020-04-18 21:00:14,103 - oe-selftest - INFO - Traceback (most recent call last):
  File "/home/pbarker/Projects/Yocto/poky/meta/lib/oeqa/selftest/cases/wic.py", line 529, in test_include_path_embeded
    self.assertIn('shadow', files)
AssertionError: 'shadow' not found in [...]

> +            self.assertEqual(True, files_own_by_root(res.output))
> +
> +        finally:
> +            os.environ['PATH'] = oldpath
> +
> +    def test_include_path_errors(self):
> +        """Test --include-path wks option error handling."""
> +        wks_file = 'temp.wks'
> +
> +        # Absolute argument.
> +        with open(wks_file, 'w') as wks:
> +            wks.write("part / --source rootfs --fstype=ext4 --include-path core-image-minimal-mtdutils /export")
> +        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 --include-path core-image-minimal-mtdutils ././..")
> +        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)
> +
> +        # 3 Argument pointing to parent directory.
> +        with open(wks_file, 'w') as wks:
> +            wks.write("part / --source rootfs --fstype=ext4 --include-path core-image-minimal-mtdutils export/ dummy")
> +        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)
> +
>      def test_exclude_path_errors(self):
>          """Test --exclude-path wks option error handling."""
>          wks_file = 'temp.wks'



-- 
Paul Barker
Konsulko Group