Adjust tests to zypp.conf augeas handling

test/data/zypp/zypp.conf.expected

@@ -2,11 +2,7 @@
 ## /etc/zypp/zypp.conf
 ##
 ## Boolean values are 0 1 yes no on off true false
-
-
 [main]
-
-
 ##
 ## Override the detected architecture
 ##
@@ -18,17 +14,13 @@
 ## ** of all repository data.
 ##
 # arch = s390
-
-
 ##
 ## Path where the caches are kept.
 ##
 ## Valid values: A directory
 ## Default value: /var/cache/zypp
 ##
 # cachedir = /var/cache/zypp
-
-
 ##
 ## Path where the repo metadata is downloaded and kept.
 ##
@@ -38,34 +30,27 @@
 ## Changing this needs a full refresh (incl. download) of all repository data
 ##
 # metadatadir = /var/cache/zypp/raw
-
-
 ##
 ## Path where the repo solv files are created and kept.
 ##
 ## Valid values: A directory
 ## Default value: {cachedir}/solv
 ##
 # solvfilesdir = /var/cache/zypp/solv
-
-
 ##
 ## Path where the repo packages are downloaded and kept.
 ##
 ## Valid values: A directory
 ## Default value: {cachedir}/packages
 ##
 # packagesdir = /var/cache/zypp/packages
-
-
 ##
 ## Path where the configuration files are kept.
 ##
 ## Valid values: A directory
 ## Default value: /etc/zypp
 ##
 # configdir = /etc/zypp
-
 ##
 ## Path where the known repositories .repo files are kept
 ##
@@ -75,7 +60,6 @@
 ## Changing this invalidates all known repositories
 ##
 # reposdir = /etc/zypp/repos.d
-
 ##
 ## Path where the known services .service files are kept
 ##
@@ -85,8 +69,6 @@
 ## Changing this invalidates all known services
 ##
 # servicesdir = /etc/zypp/services.d
-
-
 ##
 ## Whether repository urls should be probed when added
 ##
@@ -99,8 +81,6 @@
 ##   (e.g. 'zypper ar' will delay the check until the next refresh)
 ##
 # repo.add.probe = false
-
-
 ##
 ## Amount of time in minutes that must pass before another refresh.
 ##
@@ -119,7 +99,6 @@
 ## user-requested refresh.
 ##
 # repo.refresh.delay = 10
-
 ##
 ## Translated package descriptions to download from repos.
 ##
@@ -134,7 +113,6 @@
 ## fallback. Translations for 'en' are always downloaded.
 ##
 # repo.refresh.locales = en, de
-
 ##
 ## Maximum number of concurrent connections to use per transfer
 ##
@@ -145,7 +123,6 @@
 ## Setting it to a reasonable number avoids flooding servers
 ##
 # download.max_concurrent_connections = 5
-
 ##
 ## Sets the minimum download speed (bytes per second)
 ## until the connection is dropped
@@ -155,16 +132,13 @@
 ## 0 means no limit
 ##
 # download.min_download_speed = 0
-
 ## Maximum download speed (bytes per second)
 ## 0 means no limit
 # download.max_download_speed = 0
-
 ## Number of tries per download which will be
 ## done without user interaction
 ## 0 means no limit (use with caution)
 # download.max_silent_tries = 5
-
 ##
 ## Maximum time in seconds that you allow a transfer operation to take.
 ##
@@ -176,7 +150,6 @@
 ## Default value: 180
 ##
 # download.transfer_timeout = 180
-
 ##
 ## Whether to consider using a .delta.rpm when downloading a package
 ##
@@ -190,7 +163,6 @@
 ## not too slow, you benefit from disabling .delta.rpm.
 ##
 # download.use_deltarpm = true
-
 ##
 ## Whether to consider using a deltarpm even when rpm is local
 ##
@@ -200,7 +172,6 @@
 ## This option has no effect unless download.use_deltarpm is set true.
 ##
 #  download.use_deltarpm.always = false
-
 ##
 ## Hint which media to prefer when installing packages (download vs. CD).
 ##
@@ -226,7 +197,6 @@
 ## instead.
 ##
 ## download.media_preference = download
-
 ##
 ## Path where media are preferably mounted or downloaded
 ##
@@ -240,7 +210,6 @@
 ## the fallback is to use /var/tmp.
 ##
 ## download.media_mountdir = /var/adm/mount
-
 ##
 ## Signature checking (repodata and rpm packages)
 ##
@@ -267,7 +236,6 @@
 ##
 # repo_gpgcheck = unset -> according to gpgcheck
 # pkg_gpgcheck =  unset -> according to gpgcheck
-
 ##
 ## Commit download policy to use as default.
 ##
@@ -289,7 +257,6 @@
 ##			some sane default.
 ##
 ## commit.downloadMode =
-
 ##
 ## Defining directory which contains vendor description files.
 ##
@@ -309,8 +276,6 @@
 ## Default value: {configdir}/vendors.d
 ##
 # vendordir = /etc/zypp/vendors.d
-
-
 ##
 ## Whether required packages are installed ONLY
 ## So recommended packages, language packages and packages which depend
@@ -319,8 +284,7 @@
 ## Valid values: boolean
 ## Default value: false
 ##
-solver.onlyRequires = true
-
+# solver.onlyRequires = false
 ##
 ## EXPERTS ONLY: Per default the solver will not replace packages of
 ## different vendors, unless you explicitly ask to do so. Setting this
@@ -334,7 +298,6 @@ solver.onlyRequires = true
 ## Default value: false
 ##
 # solver.allowVendorChange = false
-
 ##
 ## EXPERTS ONLY: TUNE DISTRIBUTION UPGRADE (DUP)
 ## Set whether to allow package version downgrades upon DUP.
@@ -345,7 +308,6 @@ solver.onlyRequires = true
 ## Default value: true
 ##
 # solver.dupAllowDowngrade = true
-
 ##
 ## EXPERTS ONLY: TUNE DISTRIBUTION UPGRADE (DUP)
 ## Set whether follow package renames upon DUP.
@@ -356,7 +318,6 @@ solver.onlyRequires = true
 ## Default value: true
 ##
 # solver.dupAllowNameChange = true
-
 ##
 ## EXPERTS ONLY: TUNE DISTRIBUTION UPGRADE (DUP)
 ## Set whether to allow changing the packages architecture upon DUP.
@@ -367,7 +328,6 @@ solver.onlyRequires = true
 ## Default value: true
 ##
 # solver.dupAllowArchChange = true
-
 ##
 ## EXPERTS ONLY: TUNE DISTRIBUTION UPGRADE (DUP)
 ## Set whether to allow changing the packages vendor upon DUP. If you
@@ -383,7 +343,6 @@ solver.onlyRequires = true
 ## Default value: true
 ##
 # solver.dupAllowVendorChange = true
-
 ##
 ## EXPERTS ONLY: Cleanup when deleting packages. Whether the solver should
 ## per default try to remove packages exclusively required by the ones he's
@@ -400,7 +359,6 @@ solver.onlyRequires = true
 ## Default value: false
 ##
 # solver.cleandepsOnRemove = false
-
 ##
 ## This file contains requirements/conflicts which fulfill the
 ## needs of a running system.
@@ -415,7 +373,6 @@ solver.onlyRequires = true
 ## Default value: {configdir}/systemCheck
 ##
 # solver.checkSystemFile = /etc/zypp/systemCheck
-
 ##
 ## This directory can contain files that contain requirements/conflicts
 ## which fulfill the needs of a running system (see checkSystemFile).
@@ -425,7 +382,6 @@ solver.onlyRequires = true
 ## Default value: {configdir}/systemCheck.d
 ##
 # solver.checkSystemFileDir = /etc/zypp/systemCheck.d
-
 ##
 ## When committing a dist upgrade (e.g. 'zypper dup') a solver testcase
 ## is written to /var/log/updateTestcase-<date>. It is needed in bugreports.
@@ -438,7 +394,6 @@ solver.onlyRequires = true
 ## Default value:	2
 ##
 # solver.upgradeTestcasesToKeep = 2
-
 ##
 ## Whether dist upgrade should remove a products dropped packages.
 ##
@@ -456,7 +411,6 @@ solver.onlyRequires = true
 ## Default value:	true
 ##
 # solver.upgradeRemoveDroppedPackages = true
-
 ##
 ## Packages which can be installed in different versions at the same time.
 ##
@@ -474,7 +428,6 @@ solver.onlyRequires = true
 ##	empty
 ##
 multiversion =
-
 ##
 ## Defining directory which may contain additional multiversion definitions.
 ##
@@ -492,7 +445,6 @@ multiversion =
 ## Default value: {configdir}/multiversion.d
 ##
 # multiversiondir = /etc/zypp/multiversion.d
-
 ## Comma separated list of kernel packages to keep installed in parallel, if the
 ## above multiversion variable is set. Packages can be specified as
 ## 2.6.32.12-0.7 - Exact version to keep
@@ -507,7 +459,6 @@ multiversion =
 ##
 ## Default: Do not delete any kernels if multiversion = provides:multiversion(kernel) is set
 multiversion.kernels = latest,latest-1,running
-
 ##
 ## Path to locks file. If not exist then is create.
 ## In this file is saved also UI locks.
@@ -516,15 +467,13 @@ multiversion.kernels = latest,latest-1,running
 ## default value: {configdir}/locks
 ##
 # locksfile.path = /etc/zypp/locks
-
 ##
 ## Whether to apply locks in locks file after zypp start.
 ##
 ## Valid values: boolean
 ## Default value: true
 ##
 # locksfile.apply = true
-
 ##
 ## Where update items are stored
 ## (example: scripts, messages)
@@ -533,23 +482,20 @@ multiversion.kernels = latest,latest-1,running
 ## Default value: /var/adm
 ##
 # update.datadir = /var/adm
-
 ##
 ## Where update messages are stored
 ##
 ## Valid values: path to directory
 ## Default value: {update.datadir}/update-messages
 ##
 # update.messagesdir = /var/adm/update-messages
-
 ##
 ## Where update scripts are stored
 ##
 ## Valid values: path to directory
 ## Default value: {update.datadir}/update-scripts
 ##
 # update.scriptsdir = /var/adm/update-scripts
-
 ##
 ## Command to be invoked to send update messages.
 ##
@@ -586,7 +532,6 @@ multiversion.kernels = latest,latest-1,running
 ## Default value: single | /usr/lib/zypp/notify-message -p %p
 ##
 # update.messages.notify = single | /usr/lib/zypp/notify-message -p %p
-
 ##
 ## Options for package installation: excludedocs
 ##
@@ -595,8 +540,7 @@ multiversion.kernels = latest,latest-1,running
 ## Valid values:  boolean
 ## Default value: no
 ##
-rpm.install.excludedocs = yes
-
+# rpm.install.excludedocs = no
 ##
 ## Location of history log file.
 ##
@@ -607,7 +551,6 @@ rpm.install.excludedocs = yes
 ## Default value: /var/log/zypp/history
 ##
 # history.logfile = /var/log/zypp/history
-
 ##
 ## Global credentials directory path.
 ##
@@ -618,7 +561,6 @@ rpm.install.excludedocs = yes
 ## Default value: /etc/zypp/credentials.d
 ##
 # credentials.global.dir = /etc/zypp/credentials.d
-
 ##
 ## Global credentials catalog file path.
 ##
@@ -631,3 +573,5 @@ rpm.install.excludedocs = yes
 ## Default value: /etc/zypp/credentials.cat
 ##
 # credentials.global.file = /etc/zypp/credentials.cat
+solver.onlyRequires=true
+rpm.install.excludedocs=yes