Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-kiwi for openSUSE:Factory checked in at 2022-02-17 00:29:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Thu Feb 17 00:29:51 2022 rev:93 rq:954398 version:9.24.23 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2022-02-06 23:55:02.922511330 +0100 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new.1956/python-kiwi.changes 2022-02-17 00:29:52.769440032 +0100 @@ -1,0 +2,65 @@ +Mon Feb 07 22:16:48 CET 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Bump version: 9.24.22 ??? 9.24.23 + +------------------------------------------------------------------- +Mon Feb 07 22:15:25 CET 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Fixed name of secret variable + + The ci-update-build-tests action used a wrong variable + name which does not exist in the github secrets. This + commit fixes it and uses the correct variable name + +------------------------------------------------------------------- +Mon Feb 07 22:08:48 CET 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Bump version: 9.24.21 ??? 9.24.22 + +------------------------------------------------------------------- +Mon Feb 07 22:06:36 CET 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Revert "Revert "Fixed MicroOS build test"" + + This reverts commit 8c4464b8ff2af2642439ce92e1e2be497f2b0f4d. + snapper default config has moved from /etc to /usr/share + now hopefully for the last time + +------------------------------------------------------------------- +Mon Feb 07 17:25:33 CET 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Fixed unit tests + + The pytest interface setup() method call has changed + in a way that an additional parameter is passed to + the method which leads to a python error at invocation + time if the setup method does not define it. + +------------------------------------------------------------------- +Mon Feb 07 15:40:02 CET 2022 - Neal Gompa <ngo...@centosproject.org> + +- build-tests: Update CentOS 8 test appliance to CentOS Stream 8 + + CentOS Linux 8 is now EOL, so switch over to CentOS Stream 8. + +------------------------------------------------------------------- +Fri Feb 04 09:50:54 CET 2022 - Marcus Sch??fer <marcus.schae...@gmail.com> + +- Fixed handling of oem reboot settings + + There are oem settings called oem-reboot, oem-reboot-interactive + as well as oem-shutdown and oem-shutdown-interactive. When used + the information is passed along to the profile but not evaluated + by any initrd code. I don't know where on the way we lost the + code that actually works with these settings but this commit + makes them effective. This Fixes #2056 + +------------------------------------------------------------------- +Thu Feb 03 17:40:07 CET 2022 - Dirk M??ller <d...@dmllr.de> + +- treat armv8l as armv7hl + + openSUSE switched from armv7hl buildworkers to aarch64 in 32bit mode + which identifies itself as "armv8l" in uname -m. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.GGvZ1z/_old 2022-02-17 00:29:53.517439904 +0100 +++ /var/tmp/diff_new_pack.GGvZ1z/_new 2022-02-17 00:29:53.521439903 +0100 @@ -43,7 +43,7 @@ %endif Name: python-kiwi -Version: 9.24.21 +Version: 9.24.23 Provides: kiwi-schema = 7.4 Release: 0 Url: https://github.com/OSInside/kiwi ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.GGvZ1z/_old 2022-02-17 00:29:53.561439896 +0100 +++ /var/tmp/diff_new_pack.GGvZ1z/_new 2022-02-17 00:29:53.569439895 +0100 @@ -3,7 +3,7 @@ pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay') arch=(x86_64) -pkgver=9.24.21 +pkgver=9.24.23 pkgrel=0 pkgdesc="KIWI - Appliance Builder Next Generation" url="https://github.com/SUSE/kiwi/tarball/master"; @@ -12,7 +12,7 @@ provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('ea4fbbc9831b75d0d85b0459facb1b24') +md5sums=('615bcb80225706fbc1b42b05181ca002') build() { ++++++ python-kiwi.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/.bumpversion.cfg new/kiwi-9.24.23/.bumpversion.cfg --- old/kiwi-9.24.21/.bumpversion.cfg 2022-02-01 10:15:00.000000000 +0100 +++ new/kiwi-9.24.23/.bumpversion.cfg 2022-02-07 22:16:48.000000000 +0100 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 9.24.21 +current_version = 9.24.23 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/PKG-INFO new/kiwi-9.24.23/PKG-INFO --- old/kiwi-9.24.21/PKG-INFO 2022-02-01 10:17:25.000000000 +0100 +++ new/kiwi-9.24.23/PKG-INFO 2022-02-07 22:20:13.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: kiwi -Version: 9.24.21 +Version: 9.24.23 Summary: KIWI - Appliance Builder (next generation) Home-page: https://osinside.github.io/kiwi Author: Marcus Schaefer Binary files old/kiwi-9.24.21/doc/build/latex/kiwi.pdf and new/kiwi-9.24.23/doc/build/latex/kiwi.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi.8 new/kiwi-9.24.23/doc/build/man/kiwi.8 --- old/kiwi-9.24.21/doc/build/man/kiwi.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi \- Creating Operating System Images .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::image::info.8 new/kiwi-9.24.23/doc/build/man/kiwi::image::info.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::image::info.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::image::info.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::IMAGE::INFO" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::IMAGE::INFO" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::image::info \- Provide detailed information about an image description .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::image::resize.8 new/kiwi-9.24.23/doc/build/man/kiwi::image::resize.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::image::resize.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::image::resize.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::IMAGE::RESIZE" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::IMAGE::RESIZE" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::image::resize \- Resize disk images to new geometry .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::result::bundle.8 new/kiwi-9.24.23/doc/build/man/kiwi::result::bundle.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::result::bundle.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::result::bundle.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::RESULT::BUNDLE" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::RESULT::BUNDLE" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::result::bundle \- Bundle build results .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::result::list.8 new/kiwi-9.24.23/doc/build/man/kiwi::result::list.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::result::list.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::result::list.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::RESULT::LIST" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::RESULT::LIST" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::result::list \- List build results .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::system::build.8 new/kiwi-9.24.23/doc/build/man/kiwi::system::build.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::system::build.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::system::build.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::BUILD" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::SYSTEM::BUILD" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::system::build \- Build image in combined prepare and create step .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::system::create.8 new/kiwi-9.24.23/doc/build/man/kiwi::system::create.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::system::create.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::system::create.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::CREATE" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::SYSTEM::CREATE" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::system::create \- Create image from prepared root system .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::system::prepare.8 new/kiwi-9.24.23/doc/build/man/kiwi::system::prepare.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::system::prepare.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::system::prepare.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::PREPARE" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::SYSTEM::PREPARE" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::system::prepare \- Prepare image root system .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/build/man/kiwi::system::update.8 new/kiwi-9.24.23/doc/build/man/kiwi::system::update.8 --- old/kiwi-9.24.21/doc/build/man/kiwi::system::update.8 2022-02-01 10:17:24.000000000 +0100 +++ new/kiwi-9.24.23/doc/build/man/kiwi::system::update.8 2022-02-07 22:20:13.000000000 +0100 @@ -27,7 +27,7 @@ .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KIWI::SYSTEM::UPDATE" "8" "Feb 01, 2022" "9.24.21" "KIWI NG" +.TH "KIWI::SYSTEM::UPDATE" "8" "Feb 07, 2022" "9.24.23" "KIWI NG" .SH NAME kiwi::system::update \- Update/Upgrade image root system .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/doc/source/conf.py new/kiwi-9.24.23/doc/source/conf.py --- old/kiwi-9.24.21/doc/source/conf.py 2022-02-01 10:15:00.000000000 +0100 +++ new/kiwi-9.24.23/doc/source/conf.py 2022-02-07 22:16:48.000000000 +0100 @@ -139,7 +139,7 @@ # built documents. # # The short X.Y version. -version = '9.24.21' +version = '9.24.23' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh new/kiwi-9.24.23/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh --- old/kiwi-9.24.21/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh 2022-02-07 22:08:29.000000000 +0100 @@ -8,25 +8,6 @@ #====================================== # Functions #-------------------------------------- -function report_and_quit { - local text_message="$1" - run_dialog --timeout 60 --msgbox "\"${text_message}\"" 5 80 - if getargbool 0 rd.debug; then - die "${text_message}" - else - reboot -f - fi -} - -function initialize { - local profile=/.profile - - test -f ${profile} || \ - report_and_quit "No profile setup found" - - import_file ${profile} -} - function scan_multipath_devices { # """ # starts multipath daemon from multipath module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/dracut/modules.d/99kiwi-dump-reboot/kiwi-dump-reboot-system.sh new/kiwi-9.24.23/dracut/modules.d/99kiwi-dump-reboot/kiwi-dump-reboot-system.sh --- old/kiwi-9.24.21/dracut/modules.d/99kiwi-dump-reboot/kiwi-dump-reboot-system.sh 2021-07-14 18:09:36.000000000 +0200 +++ new/kiwi-9.24.23/dracut/modules.d/99kiwi-dump-reboot/kiwi-dump-reboot-system.sh 2022-02-07 22:08:29.000000000 +0100 @@ -1,4 +1,5 @@ #!/bin/bash +type initialize >/dev/null 2>&1 || . /lib/kiwi-lib.sh type report_and_quit >/dev/null 2>&1 || . /lib/kiwi-dump-image.sh type get_selected_disk >/dev/null 2>&1 || . /lib/kiwi-dump-image.sh type run_dialog >/dev/null 2>&1 || . /lib/kiwi-dialog-lib.sh @@ -7,7 +8,31 @@ # Functions #-------------------------------------- function boot_installed_system { + declare kiwi_oemreboot=${kiwi_oemreboot} + declare kiwi_oemrebootinteractive=${kiwi_oemrebootinteractive} + declare kiwi_oemshutdown=${kiwi_oemshutdown} + declare kiwi_oemshutdowninteractive=${kiwi_oemshutdowninteractive} + local ask_reboot_text="Reboot System ?" + local ask_shutdown_text="Shutdown System ?" local boot_options + kiwi_oemreboot=$(bool "${kiwi_oemreboot}") + kiwi_oemrebootinteractive=$(bool "${kiwi_oemrebootinteractive}") + kiwi_oemshutdown=$(bool "${kiwi_oemshutdown}") + kiwi_oemshutdowninteractive=$(bool "${kiwi_oemshutdowninteractive}") + + if [ "${kiwi_oemrebootinteractive}" = "true" ];then + ask_and_reboot "${ask_reboot_text}" + fi + if [ "${kiwi_oemreboot}" = "true" ];then + reboot -f + fi + if [ "${kiwi_oemshutdowninteractive}" = "true" ];then + ask_and_shutdown "${ask_shutdown_text}" + fi + if [ "${kiwi_oemshutdown}" = "true" ];then + reboot -f -p + fi + # if rd.kiwi.install.pass.bootparam is given, pass on most # boot options to the kexec kernel if getargbool 0 rd.kiwi.install.pass.bootparam; then @@ -36,6 +61,7 @@ #====================================== # Reboot into system #-------------------------------------- +initialize if getargbool 0 rd.kiwi.ramdisk; then # For ramdisk deployment a kexec boot is not possible as it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/dracut/modules.d/99kiwi-lib/kiwi-dialog-lib.sh new/kiwi-9.24.23/dracut/modules.d/99kiwi-lib/kiwi-dialog-lib.sh --- old/kiwi-9.24.21/dracut/modules.d/99kiwi-lib/kiwi-dialog-lib.sh 2021-07-14 18:09:36.000000000 +0200 +++ new/kiwi-9.24.23/dracut/modules.d/99kiwi-lib/kiwi-dialog-lib.sh 2022-02-07 22:08:29.000000000 +0100 @@ -124,3 +124,31 @@ fi return 0 } + +function report_and_quit { + local text_message="$1" + run_dialog --timeout 60 --msgbox "\"${text_message}\"" 5 80 + if getargbool 0 rd.debug; then + die "${text_message}" + else + reboot -f + fi +} + +function ask_and_reboot { + local text_message="$1" + if ! run_dialog --yesno "\"${text_message}\"" 7 80; then + die "${text_message}" + else + reboot -f + fi +} + +function ask_and_shutdown { + local text_message="$1" + if ! run_dialog --yesno "\"${text_message}\"" 7 80; then + die "${text_message}" + else + reboot -f -p + fi +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/dracut/modules.d/99kiwi-lib/kiwi-lib.sh new/kiwi-9.24.23/dracut/modules.d/99kiwi-lib/kiwi-lib.sh --- old/kiwi-9.24.21/dracut/modules.d/99kiwi-lib/kiwi-lib.sh 2021-07-14 18:09:36.000000000 +0200 +++ new/kiwi-9.24.23/dracut/modules.d/99kiwi-lib/kiwi-lib.sh 2022-02-07 22:08:29.000000000 +0100 @@ -167,3 +167,17 @@ echo "false" fi } + +function initialize { + # """ + # Source profile variables into runtime environment + # The method will exit from the initrd if the profile + # file does not exist + # """ + local profile=/.profile + + test -f ${profile} || \ + report_and_quit "No profile setup found" + + import_file ${profile} +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/kiwi/defaults.py new/kiwi-9.24.23/kiwi/defaults.py --- old/kiwi-9.24.21/kiwi/defaults.py 2022-01-31 09:11:03.000000000 +0100 +++ new/kiwi-9.24.23/kiwi/defaults.py 2022-02-05 14:12:40.000000000 +0100 @@ -1170,6 +1170,7 @@ 'armv6l': ['efi', 'uefi'], 'armv7hl': ['efi', 'uefi'], 'armv7l': ['efi', 'uefi'], + 'armv8l': ['efi', 'uefi'], 'ppc': ['ofw'], 'ppc64': ['ofw', 'opal'], 'ppc64le': ['ofw', 'opal'], @@ -1205,6 +1206,7 @@ 'armv6l': 'efi', 'armv7hl': 'efi', 'armv7l': 'efi', + 'armv8l': 'efi', 'riscv64': 'efi' } if arch in default_firmware: @@ -1262,6 +1264,7 @@ 'armv5tel': 'arm-efi', 'armv6l': 'arm-efi', 'armv7l': 'arm-efi', + 'armv8l': 'arm-efi', 'riscv64': 'riscv64-efi' } if arch in default_module_directory_names: @@ -1297,6 +1300,7 @@ 'armv5tel': 'bootarm.efi', 'armv6l': 'bootarm.efi', 'armv7l': 'bootarm.efi', + 'armv8l': 'bootarm.efi', 'riscv64': 'bootriscv64.efi' } if arch in default_efi_image_names: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/kiwi/version.py new/kiwi-9.24.23/kiwi/version.py --- old/kiwi-9.24.21/kiwi/version.py 2022-02-01 10:15:00.000000000 +0100 +++ new/kiwi-9.24.23/kiwi/version.py 2022-02-07 22:16:48.000000000 +0100 @@ -18,5 +18,5 @@ """ Global version information used in kiwi and the package """ -__version__ = '9.24.21' -__githash__ = '6cf9e3c7af82eea7248d5a22372f8e0dc55c6a1c' +__version__ = '9.24.23' +__githash__ = '7f1b49b3fbd1f0afec2e6ce23514dd42e15fcd75' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/kiwi.egg-info/PKG-INFO new/kiwi-9.24.23/kiwi.egg-info/PKG-INFO --- old/kiwi-9.24.21/kiwi.egg-info/PKG-INFO 2022-02-01 10:17:25.000000000 +0100 +++ new/kiwi-9.24.23/kiwi.egg-info/PKG-INFO 2022-02-07 22:20:13.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: kiwi -Version: 9.24.21 +Version: 9.24.23 Summary: KIWI - Appliance Builder (next generation) Home-page: https://osinside.github.io/kiwi Author: Marcus Schaefer Binary files old/kiwi-9.24.21/test/unit/.coverage and new/kiwi-9.24.23/test/unit/.coverage differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/archive/tar_test.py new/kiwi-9.24.23/test/unit/archive/tar_test.py --- old/kiwi-9.24.21/test/unit/archive/tar_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/archive/tar_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -11,7 +11,7 @@ class TestArchiveTar: @patch('kiwi.archive.tar.Command.run') - def setup(self, mock_command): + def setup(self, mock_ArchiveTar, mock_command): command = mock.Mock() command.output = 'version 1.27.0' mock_command.return_value = command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/boot/image/base_test.py new/kiwi-9.24.23/test/unit/boot/image/base_test.py --- old/kiwi-9.24.21/test/unit/boot/image/base_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/boot/image/base_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -17,7 +17,7 @@ class TestBootImageBase: @patch('kiwi.boot.image.base.os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_BootImageBase, mock_exists): Defaults.set_platform_name('x86_64') self.boot_names_type = namedtuple( 'boot_names_type', ['kernel_name', 'initrd_name'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/boot/image/builtin_kiwi_test.py new/kiwi-9.24.23/test/unit/boot/image/builtin_kiwi_test.py --- old/kiwi-9.24.21/test/unit/boot/image/builtin_kiwi_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/boot/image/builtin_kiwi_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -20,7 +20,9 @@ @patch('kiwi.boot.image.builtin_kiwi.Temporary') @patch('kiwi.boot.image.builtin_kiwi.os.path.exists') @patch('kiwi.defaults.Defaults.get_boot_image_description_path') - def setup(self, mock_boot_path, mock_exists, mock_Temporary): + def setup( + self, mock_BootImageKiwi, mock_boot_path, mock_exists, mock_Temporary + ): mock_Temporary.return_value.new_dir.return_value.name = \ 'boot-root-directory' mock_boot_path.return_value = '../data' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/boot/image/dracut_test.py new/kiwi-9.24.23/test/unit/boot/image/dracut_test.py --- old/kiwi-9.24.21/test/unit/boot/image/dracut_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/boot/image/dracut_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -12,7 +12,7 @@ class TestBootImageKiwi: @patch('kiwi.boot.image.dracut.Command.run') @patch('kiwi.boot.image.base.os.path.exists') - def setup(self, mock_exists, mock_cmd): + def setup(self, mock_BootImageDracut, mock_exists, mock_cmd): Defaults.set_platform_name('x86_64') mock_exists.return_value = True command_type = namedtuple('command', ['output']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/bootloader/config/grub2_test.py new/kiwi-9.24.23/test/unit/bootloader/config/grub2_test.py --- old/kiwi-9.24.21/test/unit/bootloader/config/grub2_test.py 2022-01-28 12:24:27.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/bootloader/config/grub2_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -37,7 +37,7 @@ @patch('kiwi.bootloader.config.grub2.FirmWare') @patch('kiwi.bootloader.config.base.BootLoaderConfigBase.get_boot_theme') - def setup(self, mock_theme, mock_firmware): + def setup(self, mock_BootLoaderConfigGrub2, mock_theme, mock_firmware): Defaults.set_platform_name('x86_64') self.command_type = namedtuple( 'command_return_type', ['output'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/bootloader/config/isolinux_test.py new/kiwi-9.24.23/test/unit/bootloader/config/isolinux_test.py --- old/kiwi-9.24.21/test/unit/bootloader/config/isolinux_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/bootloader/config/isolinux_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -18,7 +18,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_BootLoaderConfigIsoLinux, mock_exists): Defaults.set_platform_name('x86_64') mock_exists.return_value = True self.state = mock.Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/builder/container_test.py new/kiwi-9.24.23/test/unit/builder/container_test.py --- old/kiwi-9.24.21/test/unit/builder/container_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/builder/container_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -12,7 +12,7 @@ class TestContainerBuilder: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_ContainerBuilder, mock_exists): Defaults.set_platform_name('x86_64') self.runtime_config = mock.Mock() self.runtime_config.get_max_size_constraint = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/builder/disk_test.py new/kiwi-9.24.23/test/unit/builder/disk_test.py --- old/kiwi-9.24.21/test/unit/builder/disk_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/builder/disk_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -34,7 +34,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_DiskBuilder, mock_exists): Defaults.set_platform_name('x86_64') def side_effect(filename): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/builder/filesystem_test.py new/kiwi-9.24.23/test/unit/builder/filesystem_test.py --- old/kiwi-9.24.21/test/unit/builder/filesystem_test.py 2021-10-25 14:25:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/builder/filesystem_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -15,7 +15,7 @@ class TestFileSystemBuilder: @patch('kiwi.builder.filesystem.FileSystemSetup') - def setup(self, mock_fs_setup): + def setup(self, mock_FileSystemBuilder, mock_fs_setup): Defaults.set_platform_name('x86_64') self.loop_provider = Mock() self.loop_provider.get_device = Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/builder/kis_test.py new/kiwi-9.24.23/test/unit/builder/kis_test.py --- old/kiwi-9.24.21/test/unit/builder/kis_test.py 2022-01-05 23:47:40.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/builder/kis_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -19,7 +19,7 @@ @patch('kiwi.builder.kis.FileSystemBuilder') @patch('kiwi.builder.kis.BootImage') - def setup(self, mock_boot, mock_filesystem): + def setup(self, mock_KisBuilder, mock_boot, mock_filesystem): self.setup = Mock() self.runtime_config = Mock() self.runtime_config.get_max_size_constraint = Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/container/appx_test.py new/kiwi-9.24.23/test/unit/container/appx_test.py --- old/kiwi-9.24.21/test/unit/container/appx_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/container/appx_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -11,7 +11,9 @@ class TestContainerImageAppx: @patch('kiwi.container.appx.RuntimeConfig') @patch('os.path.exists') - def setup(self, mock_os_path_exists, mock_RuntimeConfig): + def setup( + self, mock_ContainerImageAppx, mock_os_path_exists, mock_RuntimeConfig + ): mock_os_path_exists.return_value = True self.appx = ContainerImageAppx( 'root_dir', { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/container/oci_test.py new/kiwi-9.24.23/test/unit/container/oci_test.py --- old/kiwi-9.24.21/test/unit/container/oci_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/container/oci_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -18,7 +18,7 @@ self._caplog = caplog @patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help') - def setup(self, mock_cmd_caps): + def setup(self, mock_ContainerImageOCI, mock_cmd_caps): mock_cmd_caps.return_value = True self.runtime_config = mock.Mock() self.runtime_config.get_container_compression = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/container/setup/appx_test.py new/kiwi-9.24.23/test/unit/container/setup/appx_test.py --- old/kiwi-9.24.21/test/unit/container/setup/appx_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/container/setup/appx_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -12,7 +12,7 @@ class TestContainerSetupAppx: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_ContainerSetupAppx, mock_exists): mock_exists.return_value = True self.appx = ContainerSetupAppx( 'root_dir', { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/container/setup/base_test.py new/kiwi-9.24.23/test/unit/container/setup/base_test.py --- old/kiwi-9.24.21/test/unit/container/setup/base_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/container/setup/base_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -11,7 +11,7 @@ class TestContainerSetupBase: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_ContainerSetupBase, mock_exists): mock_exists.return_value = True self.container = ContainerSetupBase('root_dir') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/container/setup/oci_test.py new/kiwi-9.24.23/test/unit/container/setup/oci_test.py --- old/kiwi-9.24.21/test/unit/container/setup/oci_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/container/setup/oci_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestContainerSetupOCI: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_ContainerSetupOCI, mock_exists): mock_exists.return_value = True self.container = ContainerSetupOCI( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/btrfs_test.py new/kiwi-9.24.23/test/unit/filesystem/btrfs_test.py --- old/kiwi-9.24.21/test/unit/filesystem/btrfs_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/btrfs_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemBtrfs: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemBtrfs, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/clicfs_test.py new/kiwi-9.24.23/test/unit/filesystem/clicfs_test.py --- old/kiwi-9.24.21/test/unit/filesystem/clicfs_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/clicfs_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemClicFs: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemClicFs, mock_exists): mock_exists.return_value = True self.clicfs = FileSystemClicFs(mock.Mock(), 'root_dir') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/ext2_test.py new/kiwi-9.24.23/test/unit/filesystem/ext2_test.py --- old/kiwi-9.24.21/test/unit/filesystem/ext2_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/ext2_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemExt2: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemExt2, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/ext3_test.py new/kiwi-9.24.23/test/unit/filesystem/ext3_test.py --- old/kiwi-9.24.21/test/unit/filesystem/ext3_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/ext3_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemExt3: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemExt3, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/ext4_test.py new/kiwi-9.24.23/test/unit/filesystem/ext4_test.py --- old/kiwi-9.24.21/test/unit/filesystem/ext4_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/ext4_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemExt4: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemExt4, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/fat16_test.py new/kiwi-9.24.23/test/unit/filesystem/fat16_test.py --- old/kiwi-9.24.21/test/unit/filesystem/fat16_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/fat16_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemFat16: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemFat16, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/fat32_test.py new/kiwi-9.24.23/test/unit/filesystem/fat32_test.py --- old/kiwi-9.24.21/test/unit/filesystem/fat32_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/fat32_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemFat32: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemFat32, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/isofs_test.py new/kiwi-9.24.23/test/unit/filesystem/isofs_test.py --- old/kiwi-9.24.21/test/unit/filesystem/isofs_test.py 2022-01-28 12:24:27.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/filesystem/isofs_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -12,7 +12,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemIsoFs, mock_exists): mock_exists.return_value = True self.isofs = FileSystemIsoFs(mock.Mock(), 'root_dir') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/setup_test.py new/kiwi-9.24.23/test/unit/filesystem/setup_test.py --- old/kiwi-9.24.21/test/unit/filesystem/setup_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/setup_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -12,7 +12,7 @@ self._caplog = caplog @patch('kiwi.filesystem.setup.SystemSize') - def setup(self, mock_size): + def setup(self, mock_FileSystemSetup, mock_size): size = mock.Mock() size.accumulate_mbyte_file_sizes = mock.Mock( return_value=42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/squashfs_test.py new/kiwi-9.24.23/test/unit/filesystem/squashfs_test.py --- old/kiwi-9.24.21/test/unit/filesystem/squashfs_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/squashfs_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -8,7 +8,7 @@ class TestFileSystemSquashfs: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemSquashFs, mock_exists): mock_exists.return_value = True self.squashfs = FileSystemSquashFs(mock.Mock(), 'root_dir') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/swap_test.py new/kiwi-9.24.23/test/unit/filesystem/swap_test.py --- old/kiwi-9.24.21/test/unit/filesystem/swap_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/swap_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemSwap: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemSwap, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/filesystem/xfs_test.py new/kiwi-9.24.23/test/unit/filesystem/xfs_test.py --- old/kiwi-9.24.21/test/unit/filesystem/xfs_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/filesystem/xfs_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -7,7 +7,7 @@ class TestFileSystemXfs: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_FileSystemXfs, mock_exists): mock_exists.return_value = True provider = mock.Mock() provider.get_device = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/oci_tools/buildah_test.py new/kiwi-9.24.23/test/unit/oci_tools/buildah_test.py --- old/kiwi-9.24.21/test/unit/oci_tools/buildah_test.py 2022-01-31 09:11:03.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/oci_tools/buildah_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -17,7 +17,7 @@ self._caplog = caplog @patch('kiwi.oci_tools.base.datetime') - def setup(self, mock_datetime): + def setup(self, mock_OCIBuildah, mock_datetime): strftime = Mock() strftime.strftime = Mock(return_value='current_date') mock_datetime.utcnow = Mock( @@ -26,7 +26,7 @@ self.oci = OCIBuildah() @patch('kiwi.oci_tools.umoci.Command.run') - def teardown(self, mock_cmd_run): + def teardown(self, mock_OCIBuildah, mock_cmd_run): del self.oci mock_cmd_run.reset_mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/oci_tools/umoci_test.py new/kiwi-9.24.23/test/unit/oci_tools/umoci_test.py --- old/kiwi-9.24.21/test/unit/oci_tools/umoci_test.py 2022-01-31 09:11:03.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/oci_tools/umoci_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -9,7 +9,9 @@ @patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help') @patch('kiwi.oci_tools.base.datetime') @patch('kiwi.oci_tools.umoci.Temporary') - def setup(self, mock_Temporary, mock_datetime, mock_cmd_caps): + def setup( + self, mock_OCIUmoci, mock_Temporary, mock_datetime, mock_cmd_caps + ): mock_Temporary.return_value.new_dir.return_value.name = 'tmpdir' mock_cmd_caps.return_value = True strftime = Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/partitioner/dasd_test.py new/kiwi-9.24.23/test/unit/partitioner/dasd_test.py --- old/kiwi-9.24.21/test/unit/partitioner/dasd_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/partitioner/dasd_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -16,7 +16,7 @@ @patch('kiwi.partitioner.dasd.Command.run') @patch('kiwi.partitioner.dasd.Temporary.new_file') - def setup(self, mock_temp, mock_command): + def setup(self, mock_PartitionerDasd, mock_temp, mock_command): self.tempfile = mock.Mock() self.tempfile.name = 'tempfile' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/repository/apt_test.py new/kiwi-9.24.23/test/unit/repository/apt_test.py --- old/kiwi-9.24.21/test/unit/repository/apt_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/repository/apt_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -11,7 +11,7 @@ @patch('kiwi.repository.apt.Temporary.new_file') @patch('kiwi.repository.apt.PackageManagerTemplateAptGet') @patch('kiwi.repository.apt.Path.create') - def setup(self, mock_path, mock_template, mock_temp): + def setup(self, mock_RepositoryApt, mock_path, mock_template, mock_temp): self.apt_conf = mock.Mock() mock_template.return_value = self.apt_conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/repository/dnf_test.py new/kiwi-9.24.23/test/unit/repository/dnf_test.py --- old/kiwi-9.24.21/test/unit/repository/dnf_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/repository/dnf_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -15,7 +15,7 @@ @patch('kiwi.repository.dnf.Temporary.new_file') @patch('kiwi.repository.dnf.ConfigParser') @patch('kiwi.repository.dnf.Path.create') - def setup(self, mock_path, mock_config, mock_temp): + def setup(self, mock_RepositoryDnf, mock_path, mock_config, mock_temp): runtime_dnf_config = mock.Mock() mock_config.return_value = runtime_dnf_config tmpfile = mock.Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/repository/pacman_test.py new/kiwi-9.24.23/test/unit/repository/pacman_test.py --- old/kiwi-9.24.21/test/unit/repository/pacman_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/repository/pacman_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -12,7 +12,7 @@ @patch('kiwi.repository.pacman.Temporary.new_file') @patch('kiwi.repository.pacman.ConfigParser') @patch('kiwi.repository.pacman.Path.create') - def setup(self, mock_path, mock_config, mock_temp): + def setup(self, mock_RepositoryPacman, mock_path, mock_config, mock_temp): runtime_pacman_config = Mock() mock_config.return_value = runtime_pacman_config tmpfile = Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/repository/zypper_test.py new/kiwi-9.24.23/test/unit/repository/zypper_test.py --- old/kiwi-9.24.21/test/unit/repository/zypper_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/repository/zypper_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -14,7 +14,7 @@ class TestRepositoryZypper: @patch('kiwi.command.Command.run') @patch('kiwi.repository.zypper.Temporary.new_file') - def setup(self, mock_temp, mock_command): + def setup(self, mock_RepositoryZypper, mock_temp, mock_command): self.context_manager_mock = mock.Mock() self.file_mock = mock.Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/solver/sat_test.py new/kiwi-9.24.23/test/unit/solver/sat_test.py --- old/kiwi-9.24.21/test/unit/solver/sat_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/solver/sat_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -22,7 +22,7 @@ self._caplog = caplog @patch('importlib.import_module') - def setup(self, mock_import_module): + def setup(self, mock_Sat, mock_import_module): self.sat = Sat() self.solver = MagicMock() self.transaction = Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/storage/disk_test.py new/kiwi-9.24.23/test/unit/storage/disk_test.py --- old/kiwi-9.24.21/test/unit/storage/disk_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/storage/disk_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -19,7 +19,7 @@ self._caplog = caplog @patch('kiwi.storage.disk.Partitioner.new') - def setup(self, mock_partitioner): + def setup(self, mock_Disk, mock_partitioner): self.tempfile = mock.Mock() self.tempfile.name = 'tempfile' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/storage/loop_device_test.py new/kiwi-9.24.23/test/unit/storage/loop_device_test.py --- old/kiwi-9.24.21/test/unit/storage/loop_device_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/storage/loop_device_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -15,7 +15,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_LoopDevice, mock_exists): mock_exists.return_value = False self.loop = LoopDevice('loop-file', 20, 4096) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/storage/mapped_device_test.py new/kiwi-9.24.23/test/unit/storage/mapped_device_test.py --- old/kiwi-9.24.21/test/unit/storage/mapped_device_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/storage/mapped_device_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -10,7 +10,7 @@ class TestMappedDevice: @patch('os.path.exists') - def setup(self, mock_path): + def setup(self, mock_MappedDevice, mock_path): mock_path.return_value = True self.device_provider = Mock() self.device_provider.is_loop = Mock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/storage/subformat/base_test.py new/kiwi-9.24.23/test/unit/storage/subformat/base_test.py --- old/kiwi-9.24.21/test/unit/storage/subformat/base_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/storage/subformat/base_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -16,7 +16,7 @@ class TestDiskFormatBase: @patch('kiwi.storage.subformat.base.DiskFormatBase.post_init') - def setup(self, mock_post_init): + def setup(self, mock_DiskFormatBase, mock_post_init): Defaults.set_platform_name('x86_64') xml_data = Mock() xml_data.get_name = Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/system/kernel_test.py new/kiwi-9.24.23/test/unit/system/kernel_test.py --- old/kiwi-9.24.21/test/unit/system/kernel_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/system/kernel_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -11,7 +11,7 @@ class TestKernel: @patch('os.listdir') @patch('os.path.isdir') - def setup(self, mock_path_isdir, mock_listdir): + def setup(self, mock_Kernel, mock_path_isdir, mock_listdir): mock_path_isdir.return_value = True mock_listdir.return_value = ['1.2.3-default'] self.kernel = Kernel('root-dir') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/system/prepare_test.py new/kiwi-9.24.23/test/unit/system/prepare_test.py --- old/kiwi-9.24.21/test/unit/system/prepare_test.py 2022-01-26 08:22:33.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/system/prepare_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -30,7 +30,10 @@ @patch('kiwi.system.prepare.RootInit') @patch('kiwi.system.prepare.RootBind') @patch('kiwi.logger.Logger.get_logfile') - def setup(self, mock_get_logfile, mock_root_bind, mock_root_init): + def setup( + self, mock_SystemPrepare, mock_get_logfile, + mock_root_bind, mock_root_init + ): Defaults.set_platform_name('x86_64') mock_get_logfile.return_value = None description = XMLDescription( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/system/root_import/oci_test.py new/kiwi-9.24.23/test/unit/system/root_import/oci_test.py --- old/kiwi-9.24.21/test/unit/system/root_import/oci_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/system/root_import/oci_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -18,7 +18,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_path): + def setup(self, mock_RootImportOCI, mock_path): mock_path.return_value = True with patch.dict('os.environ', {'HOME': '../data'}): self.oci_import = RootImportOCI( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/system/setup_test.py new/kiwi-9.24.23/test/unit/system/setup_test.py --- old/kiwi-9.24.21/test/unit/system/setup_test.py 2022-01-31 09:10:59.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/system/setup_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -29,7 +29,7 @@ self._caplog = caplog @patch('kiwi.system.setup.RuntimeConfig') - def setup(self, mock_RuntimeConfig): + def setup(self, mock_SystemSetup, mock_RuntimeConfig): Defaults.set_platform_name('x86_64') self.runtime_config = Mock() self.runtime_config.get_package_changes = Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/tasks/base_test.py new/kiwi-9.24.23/test/unit/tasks/base_test.py --- old/kiwi-9.24.21/test/unit/tasks/base_test.py 2022-01-21 13:05:28.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/tasks/base_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -29,8 +29,8 @@ @patch('kiwi.cli.Cli.get_global_args') @patch('kiwi.tasks.base.RuntimeConfig') def setup( - self, mock_runtime_config, mock_global_args, mock_command_args, - mock_load_command, mock_help_check, mock_color, + self, mock_CliTask, mock_runtime_config, mock_global_args, + mock_command_args, mock_load_command, mock_help_check, mock_color, mock_setlog, mock_setLogFlag, mock_setLogLevel ): Defaults.set_platform_name('x86_64') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/utils/checksum_test.py new/kiwi-9.24.23/test/unit/utils/checksum_test.py --- old/kiwi-9.24.21/test/unit/utils/checksum_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/utils/checksum_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -12,7 +12,7 @@ class TestChecksum: @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_Checksum, mock_exists): self.ascii = encoding.getregentry().name read_results = [bytes(b''), bytes(b'data'), bytes(b''), bytes(b'data')] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/utils/compress_test.py new/kiwi-9.24.23/test/unit/utils/compress_test.py --- old/kiwi-9.24.21/test/unit/utils/compress_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/utils/compress_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -20,7 +20,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_exists): + def setup(self, mock_Compress, mock_exists): mock_exists.return_value = True self.compress = Compress('some-file', True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/utils/fstab_test.py new/kiwi-9.24.23/test/unit/utils/fstab_test.py --- old/kiwi-9.24.21/test/unit/utils/fstab_test.py 2021-07-14 18:09:37.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/utils/fstab_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -13,8 +13,11 @@ def inject_fixtures(self, caplog): self._caplog = caplog - def setup(self): + def setup(self, mock_Fstab): self.fstab = Fstab() + self.fstab.read('../data/fstab') + + def test_read(self): with self._caplog.at_level(logging.WARNING): self.fstab.read('../data/fstab') assert format( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/volume_manager/base_test.py new/kiwi-9.24.23/test/unit/volume_manager/base_test.py --- old/kiwi-9.24.21/test/unit/volume_manager/base_test.py 2022-01-31 09:11:03.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/volume_manager/base_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -11,7 +11,7 @@ class TestVolumeManagerBase: @patch('os.path.exists') - def setup(self, mock_path): + def setup(self, mock_VolumeManagerBase, mock_path): self.volume_type = namedtuple( 'volume_type', [ 'name', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/volume_manager/btrfs_test.py new/kiwi-9.24.23/test/unit/volume_manager/btrfs_test.py --- old/kiwi-9.24.21/test/unit/volume_manager/btrfs_test.py 2022-01-31 09:11:03.000000000 +0100 +++ new/kiwi-9.24.23/test/unit/volume_manager/btrfs_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -24,7 +24,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_path): + def setup(self, mock_VolumeManagerBtrfs, mock_path): self.volumes = [ volume_type( name='LVRoot', size='freespace:100', realpath='/', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.24.21/test/unit/volume_manager/lvm_test.py new/kiwi-9.24.23/test/unit/volume_manager/lvm_test.py --- old/kiwi-9.24.21/test/unit/volume_manager/lvm_test.py 2021-09-02 16:55:04.000000000 +0200 +++ new/kiwi-9.24.23/test/unit/volume_manager/lvm_test.py 2022-02-07 21:46:25.000000000 +0100 @@ -19,7 +19,7 @@ self._caplog = caplog @patch('os.path.exists') - def setup(self, mock_path): + def setup(self, mock_VolumeManagerLVM, mock_path): self.volumes = [ volume_type( name='LVRoot', size='freespace:100', realpath='/',
