Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2011-10-28 19:27:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2011-10-27 19:36:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2011-10-28 19:49:47.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Oct 28 13:58:51 CEST 2011 - [email protected] + +- v4.98.11 released + +------------------------------------------------------------------- +Fri Oct 28 09:42:50 CEST 2011 - [email protected] + +- make sure the seq command is part of the initrd + used in convertCIDRToNetmask() + +------------------------------------------------------------------- +Thu Oct 27 16:28:37 CEST 2011 - [email protected] + +- make sure pxeSetupDownloadServer() uses a deadline of 30sec + in the ping check. Otherwise it might happen that the server + online check fails even though the machine is online + + Date: Thu Oct 27 10:07:01 2011 -0400 + +- add unit test to the locator for the createTmpDirectory + method, change one of the messages from info to error in + the locator, update my e-mail address + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.izYhUu/_old 2011-10-28 19:55:26.000000000 +0200 +++ /var/tmp/diff_new_pack.izYhUu/_new 2011-10-28 19:55:26.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.98.10 +Version: 4.98.11 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-10-26 14:47:33.000000000 +0200 +++ new/kiwi/.revision 2011-10-28 13:59:34.000000000 +0200 @@ -1 +1 @@ -2f88fd27e0501929aeecd5408c0edd4bb4eb7e05 +09f7ec7b6a79943153207fd6ed51275a7441ab1f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2011-10-25 15:40:01.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2011-10-28 13:59:39.000000000 +0200 @@ -985,7 +985,7 @@ setterm kpartx vgcfgbackup vgcfgrestore lsdasd dasd_configure qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk startproc zfcp_host_configure zfcp_disk_configure vgrename - kpartx_id mpath_id dmraid dmevent_tool which mpath_wait + kpartx_id mpath_id dmraid dmevent_tool which mpath_wait seq " tools="$tools $@" for path in /sbin /usr/sbin /usr/bin /bin;do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2011-10-27 15:33:03.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-10-28 13:59:39.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.98.10"; + $data{Version} = "4.98.11"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-10-26 21:59:23.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-10-28 13:59:39.000000000 +0200 @@ -7243,7 +7243,7 @@ SERVER=tftp.$DOMAIN fi Echo "Checking Server name: $SERVER" - if ! ping -c 1 $SERVER >/dev/null 2>&1;then + if ! ping -c 1 -w 30 $SERVER >/dev/null 2>&1;then Echo "Server: $SERVER not found" if [ -z "$SERVERTYPE" ] || [ "$SERVERTYPE" = "tftp" ]; then if [ ! -z "$DHCPSIADDR" ];then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILocator.pm new/kiwi/modules/KIWILocator.pm --- old/kiwi/modules/KIWILocator.pm 2011-10-25 15:40:01.000000000 +0200 +++ new/kiwi/modules/KIWILocator.pm 2011-10-28 13:59:39.000000000 +0200 @@ -4,7 +4,7 @@ # PROJECT : OpenSUSE Build-Service # COPYRIGHT : (c) 2011 SUSE LINUX Products GmbH, Germany # : -# AUTHOR : Robert Schweikert <[email protected]> +# AUTHOR : Robert Schweikert <[email protected]> # : # BELONGS TO : Operating System images # : @@ -89,7 +89,7 @@ $kiwi -> info ("Removing old root directory '$root'"); if (-e $root."/base-system") { $kiwi -> failed(); - $kiwi -> info ("Mount point /base-system exists"); + $kiwi -> error ("Mount point '$root/base-system' exists"); $kiwi -> failed(); return undef; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWILocator.t new/kiwi/tests/unit/KIWILocator.t --- old/kiwi/tests/unit/KIWILocator.t 2011-10-18 12:50:04.000000000 +0200 +++ new/kiwi/tests/unit/KIWILocator.t 2011-10-28 13:59:39.000000000 +0200 @@ -4,7 +4,7 @@ # PROJECT : OpenSUSE Build-Service # COPYRIGHT : (c) 2011 Novell Inc. # : -# AUTHOR : Robert Schweikert <[email protected]> +# AUTHOR : Robert Schweikert <[email protected]> # : # BELONGS TO : Operating System images # : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Common/ktLog.pm new/kiwi/tests/unit/lib/Common/ktLog.pm --- old/kiwi/tests/unit/lib/Common/ktLog.pm 2011-10-25 15:40:01.000000000 +0200 +++ new/kiwi/tests/unit/lib/Common/ktLog.pm 2011-10-28 13:59:39.000000000 +0200 @@ -4,7 +4,7 @@ # PROJECT : OpenSUSE Build-Service # COPYRIGHT : (c) 2011 Novell Inc. # : -# AUTHOR : Robert Schweikert <[email protected]> +# AUTHOR : Robert Schweikert <[email protected]> # : # BELONGS TO : Operating System images # : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiLocator.pm new/kiwi/tests/unit/lib/Test/kiwiLocator.pm --- old/kiwi/tests/unit/lib/Test/kiwiLocator.pm 2011-10-25 15:40:01.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiLocator.pm 2011-10-28 13:59:39.000000000 +0200 @@ -4,7 +4,7 @@ # PROJECT : OpenSUSE Build-Service # COPYRIGHT : (c) 2011 Novell Inc. # : -# AUTHOR : Robert Schweikert <[email protected]> +# AUTHOR : Robert Schweikert <[email protected]> # : # BELONGS TO : Operating System images # : @@ -21,6 +21,7 @@ use Common::ktTestCase; use base qw /Common::ktTestCase/; +use KIWICommandLine; use KIWILocator; #========================================== @@ -59,6 +60,129 @@ } #========================================== +# test_createTmpDirInTmp +#------------------------------------------ +sub test_createTmpDirInTmp { + # ... + # Test the createTmpDirectory method for the most simplistic case + # where a temporary directory is created in /tmp, i.e. there is + # no preset root directory. + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $cmdL = $this -> __getCommandLine(); + $cmdL -> setForceNewRoot(0); + my $newTmpDir = $locator -> createTmpDirectory( undef, undef, $cmdL); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + if (! -d $newTmpDir) { + my $err = 'Temp dir "' . $newTmpDir . '" was reported to be created,'; + $err .= ' but does not exists'; + $this -> assert_null($err); + } + rmdir $newTmpDir; +} + +#========================================== +# test_createTmpDirSpecifiedDir +#------------------------------------------ +sub test_createTmpDirSpecifiedDir { + # ... + # Test the createTmpDirectory method using a specified directory + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $cmdL = $this -> __getCommandLine(); + $cmdL -> setForceNewRoot(0); + my $tmpDir = $this -> createTestTmpDir(); + my $newTmpDir = $locator -> createTmpDirectory( undef, $tmpDir, $cmdL); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('No messages set', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('none', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('No state set', $state); + $this -> assert_str_equals($tmpDir, $newTmpDir); + if (! -d $tmpDir) { + my $err = 'Temp dir "' . $tmpDir . '" was reported to be created,'; + $err .= ' but does not exists'; + $this -> assert_null($err); + } + $this -> removeTestTmpDir(); +} + +#========================================== +# test_createTmpDirSpecifiedDirForceOK +#------------------------------------------ +sub test_createTmpDirSpecifiedDirOK { + # ... + # Test the createTmpDirectory method using a specified directory + # that is not empty but is OK to be removed + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $cmdL = $this -> __getCommandLine(); + $cmdL -> setForceNewRoot(1); + my $tmpDir = $this -> createTestTmpDir(); + mkdir "$tmpDir/kiwi"; + my $newTmpDir = $locator -> createTmpDirectory( undef, $tmpDir, $cmdL); + my $msg = $kiwi -> getMessage(); + my $expected = "Removing old root directory '$tmpDir'"; + $this -> assert_str_equals($expected, $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('info', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('completed', $state); + $this -> assert_str_equals($tmpDir, $newTmpDir); + if (! -d $tmpDir) { + my $err = 'Temp dir "' . $tmpDir . '" was reported to be created,'; + $err .= ' but does not exists'; + $this -> assert_null($err); + } + rmdir "$tmpDir/kiwi"; + $this -> removeTestTmpDir(); +} + +#========================================== +# test_createTmpDirSpecifiedDirForceNotOK +#------------------------------------------ +sub test_createTmpDirSpecifiedDirNotOK { + # ... + # Test the createTmpDirectory method using a specified directory + # that is not empty and is not OK to be removed, i.e. it contains + # base-system sub directory + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $locator = $this -> __getLocator(); + my $cmdL = $this -> __getCommandLine(); + $cmdL -> setForceNewRoot(1); + my $tmpDir = $this -> createTestTmpDir(); + mkdir "$tmpDir/base-system"; + my $newTmpDir = $locator -> createTmpDirectory( undef, $tmpDir, $cmdL); + my $infoMsg = $kiwi -> getInfoMessage(); + my $expected = "Removing old root directory '$tmpDir'"; + $this -> assert_str_equals($expected, $infoMsg); + my $errMsg = $kiwi -> getErrorMessage(); + $expected = "Mount point '$tmpDir/base-system' exists"; + $this -> assert_str_equals($expected, $errMsg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('error', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('failed', $state); + $this -> assert_null($newTmpDir); + rmdir "$tmpDir/base-system"; + $this -> removeTestTmpDir(); +} + +#========================================== # test_getControlFileMultiConfig #------------------------------------------ sub test_getControlFileMultiConfig { @@ -256,6 +380,18 @@ #========================================== # __getLocator #------------------------------------------ +sub __getCommandLine { + # ... + # Helper method to create a KIWICommandLine object + # --- + my $this = shift; + my $cmdL = new KIWICommandLine ( $this -> {kiwi} ); + return $cmdL; +} + +#========================================== +# __getLocator +#------------------------------------------ sub __getLocator { # ... # Helper method to create a KIWILocator object -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
