[PATCH] testsuite: drop wix exclude path test

[PATCH] testsuite: drop wix exclude path test

[Henning Schild]

With 085d496535e5 we have that exclude feature used by several
targets in their default wks files, no need to have a dedicated
test for it anymore.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 testsuite/build_test/build_test.py | 15 ---------------
 testsuite/build_test/cibase.py     | 29 -----------------------------
 2 files changed, 44 deletions(-)

diff --git a/testsuite/build_test/build_test.py b/testsuite/build_test/build_test.py
index de9e3fcda4cc..5a771d1036cd 100644
--- a/testsuite/build_test/build_test.py
+++ b/testsuite/build_test/build_test.py
@@ -174,21 +174,6 @@ class RebuildTest(CIBaseTest):
         finally:
             self.restorefile(dpkgbase_file)
 
-class WicTest(CIBaseTest):
-
-    """
-    Test wic --exclude-path
-
-    :avocado: tags=wic,fast,full
-    """
-    def test_wic_exclude(self):
-        # TODO: remove hardcoded filenames
-        wks_path = '/scripts/lib/wic/canned-wks/sdimage-efi.wks'
-        wic_path = '/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img'
-
-        self.perform_wic_test('mc:qemuamd64-stretch:isar-image-base',
-                              wks_path, wic_path)
-
 class ContainerImageTest(CIBaseTest):
 
     """
diff --git a/testsuite/build_test/cibase.py b/testsuite/build_test/cibase.py
index 0b053aa5bee5..33bddfdaed5b 100644
--- a/testsuite/build_test/cibase.py
+++ b/testsuite/build_test/cibase.py
@@ -78,35 +78,6 @@ class CIBaseTest(CIBuilder):
         # Cleanup
         self.deletetmp(build_dir)
 
-    def perform_wic_test(self, targets, wks_path, wic_path):
-        cross = int(self.params.get('cross', default=0))
-        build_dir, bb_args = self.prep('WIC exclude build', targets, cross, 1)
-
-        layerdir_isar = self.getlayerdir('isar')
-
-        wks_file = layerdir_isar + wks_path
-        wic_img = build_dir + wic_path
-
-        if not os.path.isfile(wic_img):
-            self.fail('No build started before: ' + wic_img + ' not exist')
-
-        self.backupfile(wks_file)
-        self.backupmove(wic_img)
-
-        with open(wks_file, 'r') as file:
-            lines = file.readlines()
-        with open(wks_file, 'w') as file:
-            for line in lines:
-                file.write(re.sub(r'part \/ ', 'part \/ --exclude-path usr ',
-                                  line))
-
-        try:
-            self.bitbake(build_dir, targets, None, bb_args)
-        finally:
-            self.restorefile(wks_file)
-
-        self.restorefile(wic_img)
-
     def perform_container_test(self, targets, bitbake_cmd):
         cross = int(self.params.get('cross', default=0))
         build_dir, bb_args = self.prep('Isar Container', targets, cross, 1)
-- 
2.32.0

Re: [PATCH] testsuite: drop wix exclude path test

[Anton Mikanovich]

09.12.2021 16:58, Henning Schild wrote:
> With 085d496535e5 we have that exclude feature used by several
> targets in their default wks files, no need to have a dedicated
> test for it anymore.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>

Applied with changing 'wix'->'wic' in title, thanks.

-- 
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov