Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-06-05 15:32:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-06-01 22:31:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-06-05 15:32:18.000000000 +0200 @@ -1,0 +2,68 @@ +Mon Jun 4 09:17:40 CEST 2012 - [email protected] + +- v5.03.12 released + +------------------------------------------------------------------- +Sun Jun 3 21:19:12 CEST 2012 - [email protected] + +- fixed test_invalidProfileRequest(), it modifies the + message data thus it needs a reset to prevent after + effects in subsequent tests + +------------------------------------------------------------------- +Sun Jun 3 20:41:11 CEST 2012 - [email protected] + +- perl Test::Unit doesn't work for 12.2 anymore. Other than + that is's unmaintained since 2005. Therefore we switch to + Test::Unit::Lite which is also not really maintained but at + least still works + +------------------------------------------------------------------- +Sat Jun 2 18:02:29 CEST 2012 - [email protected] + +- unit tests for profile handling + * these do not test the usage of profiles, only the storage of + profile data in the XML object and the consistency check upon + profile request, usage will be integrated into other test at a later + date + +------------------------------------------------------------------- +Sat Jun 2 17:23:03 CEST 2012 - [email protected] + +- make the checkProfiles method of the XML object "private" + * this is an XML internal helper method and should not be + called by other modules + +------------------------------------------------------------------- +Sat Jun 2 11:14:27 CEST 2012 - [email protected] + +- unit test for XML object user data storage + +------------------------------------------------------------------- +Sat Jun 2 10:47:29 CEST 2012 - [email protected] + +- make the getVMConfigOpts method on the XML object "private" + * this is an internal helper method and should not be called + from other modules + +------------------------------------------------------------------- +Sat Jun 2 09:57:39 CEST 2012 - [email protected] + +- make the getPreferencesNodeByTagName XML method "private" + * this is an XML object internal method and should not be called + by other modules + +------------------------------------------------------------------- +Fri Jun 1 16:21:02 CEST 2012 - [email protected] + +- kernel-pae does only exists on i586/i686 architecture + +------------------------------------------------------------------- +Fri Jun 1 13:12:45 CEST 2012 - [email protected] + +- eliminate getXenDomain method from XML + * the domain is part of the Xen config and can be accessed + via getXenConfig we should not have multiple methods to + get the same data + +------------------------------------------------------------------- @@ -44,0 +113,5 @@ + +------------------------------------------------------------------- +Thu May 31 11:44:40 CEST 2012 - [email protected] + +- remove packages which do not exist in 12.2 anymore ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.ujIPW7/_old 2012-06-05 15:32:21.000000000 +0200 +++ /var/tmp/diff_new_pack.ujIPW7/_new 2012-06-05 15:32:21.000000000 +0200 @@ -21,7 +21,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.03.11 +Version: 5.03.12 Release: 0 # requirements to build packages BuildRequires: gcc-c++ @@ -429,9 +429,6 @@ %prep %setup -n %name -a2 -a3 -for i in tests/unit/*.t; do - sed -i -e 's,use Test::Unit::HarnessUnit;,use Test::Unit::Lite;,' $i -done %build # empty because of rpmlint warning rpm-buildroot-usage ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/.revision 2012-06-01 10:38:19.000000000 +0200 @@ -1 +1 @@ -2ee9a501d74d1a1d59cc07962104565dbdb3f0e6 +cc081b25834fe61c3405f63c2ed1c94ea07c4cf5 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 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2012-06-04 09:18:01.000000000 +0200 @@ -42,7 +42,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.03.11"; + $data{Version} = "5.03.12"; $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/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2012-06-04 09:18:01.000000000 +0200 @@ -236,7 +236,14 @@ #------------------------------------------ $changeset{"packagemanager"} = $src_xml->getPackageManager(); $changeset{"showlicense"} = $src_xml->getLicenseNames(); - $changeset{"domain"} = $src_xml->getXenDomain(); + my $domain; + my %xenc = $src_xml -> getXenConfig(); + if (%xenc) { + if (defined $xenc{xen_domain} && $xenc{xen_domain} ne '') { + $domain = $xenc{xen_domain}; + } + } + $changeset{"domain"} = $domain; $changeset{"displayname"} = $src_xml->getImageDisplayName(); $changeset{"locale"} = $src_xml->getLocale(); $changeset{"boot-theme"} = $src_xml->getBootTheme(); @@ -2511,7 +2518,7 @@ $sizeBytes+= $minInodes * $inodesize; $sizeBytes = sprintf ("%.0f", $sizeBytes); $minInodes*= 2; - if (open (my $FD,">$imageTree/rootfs.meta")) { + if (open (my $FD, '>', "$imageTree/rootfs.meta")) { print $FD "inode_nr=$minInodes\n"; print $FD "min_size=$sizeBytes\n"; close $FD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2012-06-04 09:18:01.000000000 +0200 @@ -184,7 +184,7 @@ #========================================== # Check profile names #------------------------------------------ - if (! $this -> checkProfiles()) { + if (! $this -> __checkProfiles()) { return; } #========================================== @@ -388,31 +388,6 @@ } #========================================== -# getPreferencesNodeByTagName -#------------------------------------------ -sub getPreferencesNodeByTagName { - # ... - # Searches in all nodes of the preferences sections - # and returns the first occurenc of the specified - # tag name. If the tag can't be found the function - # returns the first node reference - # --- - my $this = shift; - my $name = shift; - my @node = $this->{optionsNodeList} -> get_nodelist(); - foreach my $element (@node) { - if (! $this -> __requestedProfile ($element)) { - next; - } - my $tag = $element -> getElementsByTagName ("$name"); - if ($tag) { - return $element; - } - } - return $node[0]; -} - -#========================================== # getImageSize #------------------------------------------ sub getImageSize { @@ -559,7 +534,7 @@ # will use this path as destination # --- my $this = shift; - my $node = $this -> getPreferencesNodeByTagName ("defaultdestination"); + my $node = $this -> __getPreferencesNodeByTagName ("defaultdestination"); my $dest = $node -> getElementsByTagName ("defaultdestination"); return $dest; } @@ -575,7 +550,7 @@ # will use this path as root path. # --- my $this = shift; - my $node = $this -> getPreferencesNodeByTagName ("defaultroot"); + my $node = $this -> __getPreferencesNodeByTagName ("defaultroot"); my $root = $node -> getElementsByTagName ("defaultroot"); return $root; } @@ -607,7 +582,7 @@ # Get the version of the logical extend # --- my $this = shift; - my $node = $this -> getPreferencesNodeByTagName ("version"); + my $node = $this -> __getPreferencesNodeByTagName ("version"); my $version = $node -> getElementsByTagName ("version"); return $version; } @@ -982,7 +957,7 @@ $this -> {kiwi} -> failed(); return; } - my $opts = $this -> getPreferencesNodeByTagName ("packagemanager"); + my $opts = $this -> __getPreferencesNodeByTagName ("packagemanager"); my $pmgr = $opts -> getElementsByTagName ("packagemanager"); if (($pmgr) && ("$pmgr" eq "$value")) { return $this; @@ -1009,7 +984,7 @@ # --- my $this = shift; my $kiwi = $this->{kiwi}; - my $node = $this -> getPreferencesNodeByTagName ("packagemanager"); + my $node = $this -> __getPreferencesNodeByTagName ("packagemanager"); my @packMgrs = $node -> getElementsByTagName ("packagemanager"); my $pmgr = $packMgrs[0]; if (! $pmgr) { @@ -1028,7 +1003,7 @@ # --- my $this = shift; my $kiwi = $this->{kiwi}; - my $node = $this -> getPreferencesNodeByTagName ("showlicense"); + my $node = $this -> __getPreferencesNodeByTagName ("showlicense"); my @lics = $node -> getElementsByTagName ("showlicense"); my @names = (); foreach my $node (@lics) { @@ -1041,26 +1016,6 @@ } #========================================== -# getXenDomain -#------------------------------------------ -sub getXenDomain { - # ... - # Obtain the Xen domain information if set - # --- - my $this = shift; - my $tnode= $this->{typeNode}; - my $node = $tnode -> getElementsByTagName ("machine") -> get_node(1); - if (! defined $node) { - return; - } - my $domain = $node -> getAttribute ("domain"); - if ((! defined $domain) || ("$domain" eq "")) { - return; - } - return $domain; -} - -#========================================== # getOEMSwapSize #------------------------------------------ sub getOEMSwapSize { @@ -1431,7 +1386,7 @@ # Obtain the locale value or return undef # --- my $this = shift; - my $node = $this -> getPreferencesNodeByTagName ("locale"); + my $node = $this -> __getPreferencesNodeByTagName ("locale"); my $lang = $node -> getElementsByTagName ("locale"); if ((! defined $lang) || ("$lang" eq "")) { return; @@ -1447,7 +1402,7 @@ # Obtain the boot-theme value or return undef # --- my $this = shift; - my $node = $this -> getPreferencesNodeByTagName ("boot-theme"); + my $node = $this -> __getPreferencesNodeByTagName ("boot-theme"); my $theme= $node -> getElementsByTagName ("boot-theme"); if ((! defined $theme) || ("$theme" eq "")) { return; @@ -1464,7 +1419,7 @@ # RPM signatures or not # --- my $this = shift; - my $node = $this -> getPreferencesNodeByTagName ("rpm-check-signatures"); + my $node = $this -> __getPreferencesNodeByTagName ("rpm-check-signatures"); my $sigs = $node -> getElementsByTagName ("rpm-check-signatures"); if ((! defined $sigs) || ("$sigs" eq "") || ("$sigs" eq "false")) { return; @@ -1481,7 +1436,7 @@ # from installed files or not # --- my $this = shift; - my $node = $this-> getPreferencesNodeByTagName ("rpm-excludedocs"); + my $node = $this-> __getPreferencesNodeByTagName ("rpm-excludedocs"); my $xdoc = $node -> getElementsByTagName ("rpm-excludedocs"); if ((! defined $xdoc) || ("$xdoc" eq "")) { return; @@ -1498,7 +1453,7 @@ # installing packages # --- my $this = shift; - my $node = $this -> getPreferencesNodeByTagName ("rpm-force"); + my $node = $this -> __getPreferencesNodeByTagName ("rpm-force"); my $frpm = $node -> getElementsByTagName ("rpm-force"); if ((! defined $frpm) || ("$frpm" eq "") || ("$frpm" eq "false")) { return; @@ -1621,43 +1576,6 @@ return @result; } -#========================================== -# checkProfiles -#------------------------------------------ -sub checkProfiles { - # ... - # validate profile names. Wrong profile names are treated - # as fatal error because you can't know what the result of - # your image would be without the requested profile - # --- - my $this = shift; - my $pref = shift; - my $kiwi = $this->{kiwi}; - my $rref = $this->{reqProfiles}; - my @prequest; - my @profiles = $this -> getProfiles(); - if (defined $pref) { - @prequest = @{$pref}; - } elsif (defined $rref) { - @prequest = @{$rref}; - } - if (@prequest) { - foreach my $requested (@prequest) { - my $ok = 0; - foreach my $profile (@profiles) { - if ($profile->{name} eq $requested) { - $ok=1; last; - } - } - if (! $ok) { - $kiwi -> error ("Profile $requested: not found"); - $kiwi -> failed (); - return; - } - } - } - return $this; -} #========================================== # getInstSourceRepository @@ -2557,9 +2475,14 @@ #========================================== # machine #------------------------------------------ - my $xendomain = $this -> getXenDomain(); - if (defined $xendomain) { - $result{kiwi_xendomain} = $xendomain; + my $xendomain; + my $tnode= $this->{typeNode}; + my $xenNode = $tnode -> getElementsByTagName ("machine") -> get_node(1); + if ($xenNode) { + $xendomain = $xenNode -> getAttribute ("domain"); + if (defined $xendomain) { + $result{kiwi_xendomain} = $xendomain; + } } #========================================== # systemdisk @@ -2589,7 +2512,6 @@ #========================================== # oemconfig #------------------------------------------ - my $tnode= $this->{typeNode}; my $node = $tnode -> getElementsByTagName ("oemconfig") -> get_node(1); if (defined $node) { my $oemswapMB= $node @@ -2946,7 +2868,7 @@ #========================================== # configuration file settings #------------------------------------------ - my @vmConfigOpts = $this -> getVMConfigOpts(); + my @vmConfigOpts = $this -> __getVMConfigOpts(); #========================================== # save hash #------------------------------------------ @@ -3021,7 +2943,7 @@ #========================================== # configuration file settings #------------------------------------------ - my @vmConfigOpts = $this -> getVMConfigOpts(); + my @vmConfigOpts = $this -> __getVMConfigOpts(); #========================================== # save hash #------------------------------------------ @@ -4399,25 +4321,6 @@ } #========================================== -# getVMConfigOpts -#------------------------------------------ -sub getVMConfigOpts { - # ... - # Extract the <vmconfig-entry> information from the - # XML and return all options in a list - # --- - my $this = shift; - my @configOpts; - my @configNodes = $this->{systemTree} - ->getElementsByTagName ("vmconfig-entry"); - for my $node (@configNodes) { - my $value = $node->textContent(); - push @configOpts, $node->textContent(); - } - return @configOpts; -} - -#========================================== # buildImageName #------------------------------------------ sub buildImageName { @@ -4616,6 +4519,88 @@ } #========================================== +# __checkProfiles +#------------------------------------------ +sub __checkProfiles { + # ... + # validate profile names. Wrong profile names are treated + # as fatal error because you can't know what the result of + # your image would be without the requested profile + # --- + my $this = shift; + my $pref = shift; + my $kiwi = $this->{kiwi}; + my $rref = $this->{reqProfiles}; + my @prequest; + my @profiles = $this -> getProfiles(); + if (defined $pref) { + @prequest = @{$pref}; + } elsif (defined $rref) { + @prequest = @{$rref}; + } + if (@prequest) { + foreach my $requested (@prequest) { + my $ok = 0; + foreach my $profile (@profiles) { + if ($profile->{name} eq $requested) { + $ok=1; last; + } + } + if (! $ok) { + $kiwi -> error ("Profile $requested: not found"); + $kiwi -> failed (); + return; + } + } + } + return $this; +} + +#========================================== +# __getPreferencesNodeByTagName +#------------------------------------------ +sub __getPreferencesNodeByTagName { + # ... + # Searches in all nodes of the preferences sections + # and returns the first occurenc of the specified + # tag name. If the tag can't be found the function + # returns the first node reference + # --- + my $this = shift; + my $name = shift; + my @node = $this->{optionsNodeList} -> get_nodelist(); + foreach my $element (@node) { + if (! $this -> __requestedProfile ($element)) { + next; + } + my $tag = $element -> getElementsByTagName ("$name"); + if ($tag) { + return $element; + } + } + return $node[0]; +} + +#========================================== +# __getVMConfigOpts +#------------------------------------------ +sub __getVMConfigOpts { + # ... + # Extract the <vmconfig-entry> information from the + # XML and return all options in a list + # --- + my $this = shift; + my @configOpts; + my @configNodes = $this->{systemTree} + ->getElementsByTagName ("vmconfig-entry"); + for my $node (@configNodes) { + my $value = $node->textContent(); + push @configOpts, $node->textContent(); + } + return @configOpts; +} + +#========================================== # __updateDescriptionFromChangeSet #------------------------------------------ sub __updateDescriptionFromChangeSet { @@ -4940,7 +4925,7 @@ $kiwi -> info ("Updating element $item: $value"); my $addElement = new XML::LibXML::Element ("$item"); $addElement -> appendText ($value); - my $opts = $this -> getPreferencesNodeByTagName ("$item"); + my $opts = $this -> __getPreferencesNodeByTagName ("$item"); my $node = $opts -> getElementsByTagName ("$item"); if ($node) { if ("$node" eq "$value") { @@ -4977,7 +4962,7 @@ $kiwi -> info ("Adding element $item: $text"); my $addElement = new XML::LibXML::Element ("$item"); $addElement -> appendText ($text); - my $opts = $this -> getPreferencesNodeByTagName ("$item"); + my $opts = $this -> __getPreferencesNodeByTagName ("$item"); $opts -> appendChild ($addElement); $kiwi -> done (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-12.2/config.xml new/kiwi/system/boot/armv7l/oemboot/suse-12.2/config.xml --- old/kiwi/system/boot/armv7l/oemboot/suse-12.2/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-12.2/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -149,7 +149,6 @@ <package name="procps"/> </packages> <packages type="delete"> - <package name="PolicyKit"/> <package name="audit-libs"/> <package name="blocxx"/> <package name="cracklib-dict-full"/> @@ -165,10 +164,7 @@ <package name="insserv"/> <package name="iproute2"/> <package name="iptables"/> - <package name="irqbalance"/> - <package name="licenses"/> <package name="limal"/> - <package name="limal-bootloader"/> <package name="limal-perl"/> <package name="logrotate"/> <package name="make"/> @@ -184,7 +180,6 @@ <package name="perl-gettext"/> <package name="permissions"/> <package name="pm-utils"/> - <package name="pmtools"/> <package name="suse-build-key"/> </packages> </image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-12.2/config.xml new/kiwi/system/boot/armv7l/vmxboot/suse-12.2/config.xml --- old/kiwi/system/boot/armv7l/vmxboot/suse-12.2/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/armv7l/vmxboot/suse-12.2/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -122,7 +122,6 @@ <package name="xfsprogs"/> </packages> <packages type="delete"> - <package name="PolicyKit"/> <package name="audit-libs"/> <package name="blocxx"/> <package name="cracklib-dict-full"/> @@ -140,10 +139,7 @@ <package name="insserv"/> <package name="iproute2"/> <package name="iptables"/> - <package name="irqbalance"/> - <package name="licenses"/> <package name="limal"/> - <package name="limal-bootloader"/> <package name="limal-perl"/> <package name="logrotate"/> <package name="make"/> @@ -160,7 +156,6 @@ <package name="perl-gettext"/> <package name="permissions"/> <package name="pm-utils"/> - <package name="pmtools"/> <package name="suse-build-key"/> </packages> </image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/isoboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-11.4/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-11.4/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -75,7 +75,7 @@ <package name="kernel-default"/> </packages> <packages type="bootstrap" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="bootstrap" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/isoboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-12.1/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-12.1/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -76,7 +76,7 @@ <package name="kernel-default"/> </packages> <packages type="bootstrap" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="bootstrap" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-12.2/config.xml new/kiwi/system/boot/ix86/isoboot/suse-12.2/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-12.2/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-12.2/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -75,7 +75,7 @@ <package name="kernel-default"/> </packages> <packages type="bootstrap" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="bootstrap" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -74,8 +74,8 @@ <package name="kernel-default-base"/> </packages> <packages type="bootstrap" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="bootstrap" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -74,8 +74,8 @@ <package name="kernel-default-base"/> </packages> <packages type="bootstrap" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="bootstrap" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -148,7 +148,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -151,7 +151,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.2/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.2/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-12.2/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-12.2/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -151,7 +151,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -140,8 +140,8 @@ <package name="kernel-default-base"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="image" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -143,8 +143,8 @@ <package name="kernel-default-base"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="image" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -88,7 +88,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -90,7 +90,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.2/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.2/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.2/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.2/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -90,7 +90,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -80,8 +80,8 @@ <package name="kernel-default-base"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -83,8 +83,8 @@ <package name="kernel-default-base"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -73,7 +73,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -77,7 +77,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.2/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-12.2/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-12.2/config.xml 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-12.2/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -77,7 +77,7 @@ <package name="kernel-default"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> + <package name="kernel-pae" arch="i686"/> </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -69,8 +69,8 @@ <package name="kernel-default-base"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="image" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -72,8 +72,8 @@ <package name="kernel-default-base"/> </packages> <packages type="image" profiles="pae"> - <package name="kernel-pae"/> - <package name="kernel-pae-base"/> + <package name="kernel-pae" arch="i686"/> + <package name="kernel-pae-base" arch="i686"/> </packages> <packages type="image" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWICommandLine.t new/kiwi/tests/unit/KIWICommandLine.t --- old/kiwi/tests/unit/KIWICommandLine.t 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/tests/unit/KIWICommandLine.t 2012-06-04 09:18:01.000000000 +0200 @@ -15,7 +15,7 @@ use strict; use warnings; use FindBin; -use Test::Unit::HarnessUnit; +use Test::Unit::Lite; # Location of test cases according to program path use lib "$FindBin::Bin/lib"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWIImageCreator.t new/kiwi/tests/unit/KIWIImageCreator.t --- old/kiwi/tests/unit/KIWIImageCreator.t 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/tests/unit/KIWIImageCreator.t 2012-06-04 09:18:01.000000000 +0200 @@ -15,7 +15,7 @@ use strict; use warnings; use FindBin; -use Test::Unit::HarnessUnit; +use Test::Unit::Lite; # Location of test cases according to program path use lib "$FindBin::Bin/lib"; 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 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/tests/unit/KIWILocator.t 2012-06-04 09:18:01.000000000 +0200 @@ -15,7 +15,7 @@ use strict; use warnings; use FindBin; -use Test::Unit::HarnessUnit; +use Test::Unit::Lite; # Location of test cases according to program path use lib "$FindBin::Bin/lib"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWIRuntimeChecker.t new/kiwi/tests/unit/KIWIRuntimeChecker.t --- old/kiwi/tests/unit/KIWIRuntimeChecker.t 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/tests/unit/KIWIRuntimeChecker.t 2012-06-04 09:18:01.000000000 +0200 @@ -15,7 +15,7 @@ use strict; use warnings; use FindBin; -use Test::Unit::HarnessUnit; +use Test::Unit::Lite; # Location of test cases according to program path use lib "$FindBin::Bin/lib"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWIXML.t new/kiwi/tests/unit/KIWIXML.t --- old/kiwi/tests/unit/KIWIXML.t 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/tests/unit/KIWIXML.t 2012-06-04 09:18:01.000000000 +0200 @@ -15,7 +15,7 @@ use strict; use warnings; use FindBin; -use Test::Unit::HarnessUnit; +use Test::Unit::Lite; # Location of test cases according to program path use lib "$FindBin::Bin/lib"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWIXMLInfo.t new/kiwi/tests/unit/KIWIXMLInfo.t --- old/kiwi/tests/unit/KIWIXMLInfo.t 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/tests/unit/KIWIXMLInfo.t 2012-06-04 09:18:01.000000000 +0200 @@ -15,7 +15,7 @@ use strict; use warnings; use FindBin; -use Test::Unit::HarnessUnit; +use Test::Unit::Lite; # Location of test cases according to program path use lib "$FindBin::Bin/lib"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/KIWIXMLValidator.t new/kiwi/tests/unit/KIWIXMLValidator.t --- old/kiwi/tests/unit/KIWIXMLValidator.t 2012-06-01 10:38:19.000000000 +0200 +++ new/kiwi/tests/unit/KIWIXMLValidator.t 2012-06-04 09:18:01.000000000 +0200 @@ -17,7 +17,7 @@ use strict; use warnings; use FindBin; -use Test::Unit::HarnessUnit; +use Test::Unit::Lite; # Location of test cases according to program path use lib "$FindBin::Bin/lib"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/profilesConfig/config.xml new/kiwi/tests/unit/data/kiwiXML/profilesConfig/config.xml --- old/kiwi/tests/unit/data/kiwiXML/profilesConfig/config.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXML/profilesConfig/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="testCase-Split-settings"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>Test configuration to verify profile settings are stored and returned properly in the XML object</specification> + </description> + <profiles> + <profile description="Test prof A" import="false" name="profA"/> + <profile description="Test prof B" import="true" name="profB"/> + <profile description="Test prof C" name="profC"/> + </profiles> + <preferences> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-12.1" format="ovf"> + <machine des_memory="1024" max_memory="2048" memory="1024" min_memory="512" des_cpu="2" max_cpu="4" ncpus="2" min_cpu="1" ovftype="powervm"> <vmdisk device="/dev/sda" disktype="scsi"/> + <vmnic interface="eth0"/> + </machine> + </type> + <version>0.0.1</version> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </repository> + <packages type="image"> + <package name="kernel-default"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/userConfig/config.xml new/kiwi/tests/unit/data/kiwiXML/userConfig/config.xml --- old/kiwi/tests/unit/data/kiwiXML/userConfig/config.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXML/userConfig/config.xml 2012-06-04 09:18:01.000000000 +0200 @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="testCase-Split-settings"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>[email protected]</contact> + <specification>Test configuration to verify user configuration settings are stored and returned properly in the XML object</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext4" boot="vmxboot/suse-12.1" format="ovf"> + <machine des_memory="1024" max_memory="2048" memory="1024" min_memory="512" des_cpu="2" max_cpu="4" ncpus="2" min_cpu="1" ovftype="powervm"> <vmdisk device="/dev/sda" disktype="scsi"/> + <vmnic interface="eth0"/> + </machine> + </type> + <version>0.0.1</version> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <users group="mygrp" id="2000"> + <user home="/home/auser" id="2001" pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" name="auser" shell="/bin/ksh"/> + <user home="/home/buser" pwd="linux" pwdformat="plain" name="buser" realname="Bert"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </repository> + <packages type="image"> + <package name="kernel-default"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXML.pm new/kiwi/tests/unit/lib/Test/kiwiXML.pm --- old/kiwi/tests/unit/lib/Test/kiwiXML.pm 2012-06-01 10:38:23.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXML.pm 2012-06-04 09:18:01.000000000 +0200 @@ -1322,6 +1322,42 @@ } #========================================== +# test_getProfiles +#------------------------------------------ +sub test_getProfiles { + # ... + # Verify proper storage of profile information + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $confDir = $this->{dataDir} . 'profilesConfig'; + my $xml = new KIWIXML( + $this -> {kiwi}, $confDir, undef, undef, $this->{cmdL} + ); + my @profiles = $xml -> getProfiles(); + my $msg = $kiwi -> getMessage(); + $this -> assert_str_equals('Using profile(s): profB', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('info', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('completed', $state); + # Test these conditions last to get potential error messages + my $numProfiles = scalar @profiles; + $this -> assert_equals(3, $numProfiles); + for my $prof (@profiles) { + my $name = $prof -> {name}; + if ($name eq 'profA') { + $this -> assert_str_equals('false', $prof -> {include}); + $this -> assert_str_equals('Test prof A', $prof -> {description}); + } elsif ($name eq 'profB') { + $this -> assert_str_equals('true', $prof -> {include}); + } else { + $this -> assert_str_equals('profC', $prof -> {name}); + } + } +} + +#========================================== # test_getRPMCheckSignatures #------------------------------------------ sub test_getRPMCheckSignaturesFalse { @@ -1641,6 +1677,42 @@ $this -> assert_array_equal(\@expectedNames, \@toolFiles); } +#========================================== +# test_getUsers +#------------------------------------------ +sub test_getUsers { + # ... + # Verify proper return of user information + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $confDir = $this->{dataDir} . 'userConfig'; + my $xml = new KIWIXML( + $this -> {kiwi}, $confDir, undef, undef,$this->{cmdL} + ); + my %usrData = $xml -> getUsers(); + 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); + # Test these conditions last to get potential error messages + my @expectedUsers = qw /root auser buser/; + my @users = keys %usrData; + $this -> assert_array_equal(\@expectedUsers, \@users); + $this -> assert_str_equals('2000', $usrData{auser}{gid}); + $this -> assert_str_equals('2000', $usrData{buser}{gid}); + $this -> assert_str_equals('mygrp', $usrData{auser}{group}); + $this -> assert_str_equals('mygrp', $usrData{buser}{group}); + $this -> assert_str_equals('root', $usrData{root}{group}); + $this -> assert_str_equals('2001', $usrData{auser}{uid}); + $this -> assert_str_equals('/root', $usrData{root}{home}); + $this -> assert_str_equals('linux', $usrData{buser}{pwd}); + $this -> assert_str_equals('plain', $usrData{buser}{pwdformat}); + $this -> assert_str_equals('Bert', $usrData{buser}{realname}); + $this -> assert_str_equals('/bin/ksh', $usrData{auser}{shell}); +} #========================================== # test_getVMwareConfig @@ -1714,6 +1786,31 @@ } #========================================== +# test_invalidProfileRequest +#------------------------------------------ +sub test_invalidProfileRequest { + # ... + # Test the privat __checkProfiles method by passing an invalid + # profile name to the ctor. + # --- + my $this = shift; + my $kiwi = $this -> {kiwi}; + my $confDir = $this->{dataDir} . 'profilesConfig'; + my @reqProf = qw /profD/; + my $xml = new KIWIXML( + $this -> {kiwi}, $confDir, undef, \@reqProf, $this->{cmdL} + ); + $this -> assert_null($xml); + my $msg = $kiwi -> getErrorMessage(); + $this -> assert_str_equals('Profile profD: not found', $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('error', $msgT); + my $state = $kiwi -> getErrorState(); + $this -> assert_str_equals('failed', $state); + $kiwi -> __reset(); +} + +#========================================== # test_packageManagerInfoHasConfigValue #------------------------------------------ sub test_packageManagerInfoHasConfigValue { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
