Hello community,
here is the log from the commit of package salt for openSUSE:Factory checked in at 2016-11-10 13:19:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/salt (Old)
and /work/SRC/openSUSE:Factory/.salt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/salt/salt.changes 2016-09-30 15:35:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2016-11-10 13:19:08.000000000 +0100
@@ -1,0 +2,90 @@
+Wed Nov 2 13:44:18 UTC 2016 - kkaempf@suse.com
+
+- Update to 2016.3.4
+ see https://docs.saltstack.com/en/latest/topics/releases/2016.3.4.html
+- Removed Patches, applied upstream
+ * 0008-checksum-validation-when-zypper-pkg.download.patch
+ * 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch
+ * 0010-snapper-execution-module.patch
+ * 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch
+ * 0012-Run-salt-api-as-user-salt-bsc-990029.patch
+ * 0013-Deprecate-status.uptime-one-version-later.patch
+ * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch
+ * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch
+ * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch
+ * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch
+ * 0018-Unit-tests-fixes-for-2016.3.2.patch
+ * 0019-Fix-snapper_test-for-python26.patch
+ * 0020-Integration-tests-fixes-for-2016.3.2.patch
+ * 0021-Fix-pkg.upgrade-for-zypper.patch
+ * 0022-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch
+ * 0023-acl.delfacl-fix-position-of-X-option-to-setfacl.patch
+ * 0024-Change-travis-configuration-file-to-use-salt-toaster.patch
+ * 0025-Adding-dist-upgrade-support-to-zypper-module.patch
+ * 0026-Fix-pkg.latest_version-when-latest-already-installed.patch
+ * 0027-Including-resolver-params-for-Zypper-debug-solver.patch
+- Added patches
+ * 0008-snapper-execution-module.patch
+ * 0009-fix-salt-summary-to-count-not-responding-minions-cor.patch
+ * 0010-Run-salt-api-as-user-salt-bsc-990029.patch
+ * 0011-Fix-snapper_test-for-python26.patch
+ * 0012-Fix-pkg.upgrade-for-zypper.patch
+ * 0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch
+ * 0014-acl.delfacl-fix-position-of-X-option-to-setfacl.patch
+ * 0015-Change-travis-configuration-file-to-use-salt-toaster.patch
+ * 0016-Fix-pkg.latest_version-when-latest-already-installed.patch
+ * 0017-Including-resolver-params-for-Zypper-debug-solver.patch
+
+-------------------------------------------------------------------
+Mon Oct 31 16:40:49 UTC 2016 - pablo.suarezhernandez@suse.com
+
+- Including resolution parameters in the Zypper debug-solver
+ call during a dry-run dist-upgrade.
+ Add:
+ * 0027-Including-resolver-params-for-Zypper-debug-solver.patch
+
+-------------------------------------------------------------------
+-------------------------------------------------------------------
+Mon Oct 24 08:16:57 UTC 2016 - mihai.dinca@suse.com
+
+- Fix-pkg.latest_version when latest already installed (bsc#1005329)
+ Add:
+ * 0026-Fix-pkg.latest_version-when-latest-already-installed.patch
+
+-------------------------------------------------------------------
+Wed Oct 19 15:22:46 UTC 2016 - pablo.suarezhernandez@suse.com
+
+- Adding 'dist-upgrade' support to zypper module
+ Add:
+ * 0025-Adding-dist-upgrade-support-to-zypper-module.patch
+
+-------------------------------------------------------------------
+Mon Oct 17 14:09:02 UTC 2016 - mihai.dinca@suse.com
+
+- Copy .travis.yml from git commit 1829a6086a19a3f887c5216dc8aace9068063cfe
+ Add:
+ * travis.yml
+- Change travis configuration file to use salt-toaster
+ Add:
+ * 0078-Change-travis-configuration-file-to-use-salt-toaster.patch
+
+-------------------------------------------------------------------
+Thu Oct 13 15:41:50 UTC 2016 - mihai.dinca@suse.com
+
+- acl.delfacl: fix position of -X option to setfacl (bsc#1004260)
+ Add:
+ * 0023-acl.delfacl-fix-position-of-X-option-to-setfacl.patch
+
+-------------------------------------------------------------------
+Tue Oct 11 11:59:14 UTC 2016 - mc@suse.com
+
+- fix generated shebang in scripts on SLES-ES 7 (bsc#1004047)
+
+-------------------------------------------------------------------
+Wed Oct 5 13:33:25 UTC 2016 - mihai.dinca@suse.com
+
+- Setting up OS grains for SLES-ES (SLES Expanded Support platform)
+ Add:
+ * 0022-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch
+
+-------------------------------------------------------------------
Old:
----
0008-checksum-validation-when-zypper-pkg.download.patch
0009-unit-tests-for-rpm.checksum-and-zypper.download.patch
0010-snapper-execution-module.patch
0011-fix-salt-summary-to-count-not-responding-minions-cor.patch
0012-Run-salt-api-as-user-salt-bsc-990029.patch
0013-Deprecate-status.uptime-one-version-later.patch
0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch
0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch
0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch
0017-Check-for-single-quote-before-splitting-on-single-qu.patch
0018-Unit-tests-fixes-for-2016.3.2.patch
0019-Fix-snapper_test-for-python26.patch
0020-Integration-tests-fixes-for-2016.3.2.patch
0021-Fix-pkg.upgrade-for-zypper.patch
salt-2016.3.2.tar.gz
New:
----
0008-snapper-execution-module.patch
0009-fix-salt-summary-to-count-not-responding-minions-cor.patch
0010-Run-salt-api-as-user-salt-bsc-990029.patch
0011-Fix-snapper_test-for-python26.patch
0012-Fix-pkg.upgrade-for-zypper.patch
0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch
0014-acl.delfacl-fix-position-of-X-option-to-setfacl.patch
0015-Change-travis-configuration-file-to-use-salt-toaster.patch
0016-Fix-pkg.latest_version-when-latest-already-installed.patch
0017-Including-resolver-params-for-Zypper-debug-solver.patch
salt-2016.3.4.tar.gz
travis.yml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ salt.spec ++++++
--- /var/tmp/diff_new_pack.LuW5T8/_old 2016-11-10 13:19:09.000000000 +0100
+++ /var/tmp/diff_new_pack.LuW5T8/_new 2016-11-10 13:19:09.000000000 +0100
@@ -37,7 +37,7 @@
%bcond_with builddocs
Name: salt
-Version: 2016.3.2
+Version: 2016.3.4
Release: 0
Summary: A parallel remote execution system
License: Apache-2.0
@@ -49,6 +49,7 @@
Source2: salt-tmpfiles.d
Source3: html.tar.bz2
Source4: update-documentation.sh
+Source5: travis.yml
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
# We do not upstream this patch because this is something that we have to fix on our side
@@ -73,44 +74,26 @@
# if Zypper has been used outside the Salt infrastructure
# We do not upstream this because this is for SUSE only (15.08.2016)
Patch7: 0007-Add-zypp-notify-plugin.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33469
-# PR already merged. This will be gone in the next version
-Patch8: 0008-checksum-validation-when-zypper-pkg.download.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/33501
-# PR already merged. This will be gone in the next version
-Patch9: 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/34599 (backport from dev)
-# PR already merged. This will be gone in the next version
-Patch10: 0010-snapper-execution-module.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/34165
-Patch11: 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch
-# PATCH-FIX-OPENSUSE
-# We do not upstream this patch because this is suse custom configuration
-Patch12: 0012-Run-salt-api-as-user-salt-bsc-990029.patch
-# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/35196
-# PR already merged. This will be gone in the next version
-Patch13: 0013-Deprecate-status.uptime-one-version-later.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35448
-Patch14: 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35451
-Patch15: 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35763
-Patch16: 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36000
-Patch17: 0017-Check-for-single-quote-before-splitting-on-single-qu.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36139
-# https://github.com/saltstack/salt/pull/36158
-# https://github.com/saltstack/salt/pull/36227
-Patch18: 0018-Unit-tests-fixes-for-2016.3.2.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/35715
-# https://github.com/saltstack/salt/pull/35983
-# https://github.com/saltstack/salt/pull/34826
-Patch19: 0019-Fix-snapper_test-for-python26.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36263
-Patch20: 0020-Integration-tests-fixes-for-2016.3.2.patch
-# PATCH-FIX-UPSTREAM https://github.com/saltstack/salt/pull/36495
-Patch21: 0021-Fix-pkg.upgrade-for-zypper.patch
-
+# PATCH-FIX_UPSTREAM
+Patch8: 0008-snapper-execution-module.patch
+# PATCH-FIX_UPSTREAM
+Patch9: 0009-fix-salt-summary-to-count-not-responding-minions-cor.patch
+# PATCH-FIX_OPENSUSE
+Patch10: 0010-Run-salt-api-as-user-salt-bsc-990029.patch
+# PATCH-FIX_UPSTREAM
+Patch11: 0011-Fix-snapper_test-for-python26.patch
+# PATCH-FIX_UPSTREAM
+Patch12: 0012-Fix-pkg.upgrade-for-zypper.patch
+# PATCH-FIX_UPSTREAM
+Patch13: 0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch
+# PATCH-FIX_UPSTREAM
+Patch14: 0014-acl.delfacl-fix-position-of-X-option-to-setfacl.patch
+# PATCH-FIX_OPENSUSE
+Patch15: 0015-Change-travis-configuration-file-to-use-salt-toaster.patch
+# PATCH-FIX_UPSTREAM
+Patch16: 0016-Fix-pkg.latest_version-when-latest-already-installed.patch
+# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/37430
+Patch17: 0017-Including-resolver-params-for-Zypper-debug-solver.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
@@ -152,7 +135,7 @@
%if %{with builddocs}
BuildRequires: python-sphinx
%endif
-%if 0%{?suse_version} > 1010
+%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
@@ -465,6 +448,7 @@
%prep
%setup -q -n salt-%{version}
cp %{S:1} .
+cp %{S:5} ./.travis.yml
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -486,13 +470,9 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
%build
-python setup.py --salt-transport=both build
+%{__python} setup.py --salt-transport=both build
%if %{with docs} && %{without builddocs}
# extract docs from the tarball
@@ -508,7 +488,7 @@
%endif
%install
-python setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
+%{__python} setup.py --salt-transport=both install --prefix=%{_prefix} --root=%{buildroot}
## create missing directories
install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/master.d
install -Dd -m 0750 %{buildroot}%{_sysconfdir}/salt/minion.d
++++++ 0001-tserong-suse.com-We-don-t-have-python-systemd-so-not.patch ++++++
--- /var/tmp/diff_new_pack.LuW5T8/_old 2016-11-10 13:19:09.000000000 +0100
+++ /var/tmp/diff_new_pack.LuW5T8/_new 2016-11-10 13:19:09.000000000 +0100
@@ -1,7 +1,7 @@
-From 3f8257601cb1224221e10e712c0377254714f6fc Mon Sep 17 00:00:00 2001
+From 945e87477d66ada90e914e95acd5ff529477012a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
From 84bacc068ff10b33b5bd984459d6cfb73b1bf2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
Date: Fri, 30 Sep 2016 13:06:52 +0100 Subject: [PATCH 13/17] Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform)
core.py: quote style fixed --- salt/grains/core.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/grains/core.py b/salt/grains/core.py index 867924a..12a2959 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -1038,6 +1038,7 @@ _OS_NAME_MAP = { 'manjaro': 'Manjaro', 'antergos': 'Antergos', 'sles': 'SUSE', + 'slesexpand': 'RES', 'linuxmint': 'Mint', } @@ -1057,6 +1058,7 @@ _OS_FAMILY_MAP = { 'OEL': 'RedHat', 'XCP': 'RedHat', 'XenServer': 'RedHat', + 'RES': 'RedHat', 'Mandrake': 'Mandriva', 'ESXi': 'VMWare', 'Mint': 'Debian', -- 2.10.1 ++++++ 0014-acl.delfacl-fix-position-of-X-option-to-setfacl.patch ++++++
From 3da08fe5187b0a7279b0fe6d24f969bfe1026e7a Mon Sep 17 00:00:00 2001 From: Joerg Reuter
Date: Wed, 12 Oct 2016 13:02:38 +0200 Subject: [PATCH 14/17] - acl.delfacl: fix position of -X option to setfacl
Adjust linux_acl unit test argument ordering --- salt/modules/linux_acl.py | 4 +++- tests/unit/modules/linux_acl_test.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/salt/modules/linux_acl.py b/salt/modules/linux_acl.py index c23bc8c..0f5c874 100644 --- a/salt/modules/linux_acl.py +++ b/salt/modules/linux_acl.py @@ -250,10 +250,12 @@ def delfacl(acl_type, acl_name='', *args, **kwargs): _raise_on_no_files(*args) - cmd = 'setfacl -x' + cmd = 'setfacl' if recursive: cmd += ' -R' + cmd += ' -x' + cmd = '{0} {1}:{2}'.format(cmd, _acl_prefix(acl_type), acl_name) for dentry in args: diff --git a/tests/unit/modules/linux_acl_test.py b/tests/unit/modules/linux_acl_test.py index 1398636..36d3202 100644 --- a/tests/unit/modules/linux_acl_test.py +++ b/tests/unit/modules/linux_acl_test.py @@ -193,4 +193,4 @@ class LinuxAclTestCase(TestCase): def test_delfacl__recursive_w_multiple_args(self): linux_acl.delfacl(*(self.default_user_acl[:-1] + self.files), recursive=True) - self.cmdrun.assert_called_once_with('setfacl -x -R ' + ' '.join([self.default_user_acl_cmd.rpartition(':')[0]] + self.files), python_shell=False) + self.cmdrun.assert_called_once_with('setfacl -R -x ' + ' '.join([self.default_user_acl_cmd.rpartition(':')[0]] + self.files), python_shell=False) -- 2.10.1 ++++++ 0015-Change-travis-configuration-file-to-use-salt-toaster.patch ++++++
From f212d9ae3ecca09808de8a770b1099d94189a2df Mon Sep 17 00:00:00 2001 From: Mihai Dinca
Date: Fri, 14 Oct 2016 09:04:47 +0200 Subject: [PATCH 15/17] Change travis configuration file to use salt-toaster
--- .travis.yml | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b4c8ce..3101efb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,26 @@ language: python python: - - '2.6' - - '2.7' + - 2.7 -before_install: - - sudo apt-get update - - sudo apt-get install --fix-broken --ignore-missing -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" swig rabbitmq-server ruby python-apt mysql-server libmysqlclient-dev - - (git describe && git fetch --tags) || (git remote add upstream git://github.com/saltstack/salt.git && git fetch --tags upstream) - - pip install mock - - pip install --allow-external http://dl.dropbox.com/u/174789/m2crypto-0.20.1.tar.gz - - pip install --upgrade pep8 'pylint<=1.2.0' - - pip install --upgrade coveralls - - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2 ordereddict; fi" - - pip install git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting - -install: - - pip install -r requirements/zeromq.txt -r requirements/cloud.txt - - pip install --allow-all-external -r requirements/opt.txt +services: + - docker -before_script: - - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pylint --rcfile=.testing.pylintrc salt/ && echo 'Finished Pylint Check Cleanly' || echo 'Finished Pylint Check With Errors'" - - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pep8 --ignore=E501,E12 salt/ && echo 'Finished PEP-8 Check Cleanly' || echo 'Finished PEP-8 Check With Errors'" +env: + global: + - VERSION=leap42sp1 FLAVOR=devel NOPULL=true SALT_REPO=.. + matrix: + - TARGET=suse.tests PYTEST_CFG=./configs/$TARGET/$VERSION/$FLAVOR.cfg + - TARGET=saltstack.unit PYTEST_CFG=./configs/$TARGET/$VERSION/default.cfg + - TARGET=saltstack.integration PYTEST_CFG=./configs/$TARGET/$VERSION/default.cfg -script: "sudo -E /home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/python setup.py test --runtests-opts='--run-destructive --sysinfo -v --coverage'" - -after_success: - - coveralls +before_install: +- git clone --depth 1 https://github.com/openSUSE/salt-toaster.git +- cd salt-toaster +- echo "*" > .gitignore +- tar xfz sandbox.tar.gz +- sandbox/bin/pip install -r requirements.txt --exists-action w --upgrade +- VERSION=leap42sp1 FLAVOR=default NOPULL=true make build_image +- make build_image -notifications: - irc: - channels: "irc.freenode.org#salt-devel" - on_success: change - on_failure: change +script: make $TARGET PYTEST_CFG=$PYTEST_CFG -- 2.10.1 ++++++ 0016-Fix-pkg.latest_version-when-latest-already-installed.patch ++++++
From b784cb1d2dd3b190e8664c2a40e8d3c55ad4ad03 Mon Sep 17 00:00:00 2001 From: Mihai Dinca
Date: Fri, 21 Oct 2016 16:25:04 +0200 Subject: [PATCH 16/17] Fix pkg.latest_version when latest already installed
--- salt/states/pkg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/states/pkg.py b/salt/states/pkg.py index 8492de7..9cecc07 100644 --- a/salt/states/pkg.py +++ b/salt/states/pkg.py @@ -1679,7 +1679,7 @@ def latest( targets = {} problems = [] for pkg in desired_pkgs: - if not avail[pkg]: + if not avail.get(pkg): # Package either a) is up-to-date, or b) does not exist if not cur[pkg]: # Package does not exist -- 2.10.1 ++++++ 0017-Including-resolver-params-for-Zypper-debug-solver.patch ++++++
From e572a2774e186681820c6e9fc6df65516eba2abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
Date: Mon, 31 Oct 2016 16:15:36 +0000 Subject: [PATCH 17/17] Including resolver params for Zypper debug-solver
Now '--no-allow-vendor-change' and '--from' parameters are included into the zypper --debug-solver call before performing a dry-run dist-upgrade. --- salt/modules/zypper.py | 15 ++++++++------- tests/unit/modules/zypper_test.py | 7 +++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py index 49ce5ec..98451bf 100644 --- a/salt/modules/zypper.py +++ b/salt/modules/zypper.py @@ -1136,6 +1136,10 @@ def upgrade(refresh=True, cmd_update = (['dist-upgrade'] if dist_upgrade else ['update']) + ['--auto-agree-with-licenses'] + if skip_verify: + # The '--no-gpg-checks' needs to be placed before the Zypper command. + cmd_update.insert(0, '--no-gpg-checks') + if refresh: refresh_db() @@ -1143,11 +1147,6 @@ def upgrade(refresh=True, cmd_update.append('--dry-run') if dist_upgrade: - if dryrun: - # Creates a solver test case for debugging. - log.info('Executing debugsolver and performing a dry-run dist-upgrade') - __zypper__(systemd_scope=_systemd_scope()).noraise.call(*cmd_update + ['--debug-solver']) - if fromrepo: for repo in fromrepo: cmd_update.extend(['--from', repo]) @@ -1161,8 +1160,10 @@ def upgrade(refresh=True, else: log.warn('Disabling vendor changes is not supported on this Zypper version') - if skip_verify: - cmd_update.append('--no-gpg-checks') + if dryrun: + # Creates a solver test case for debugging. + log.info('Executing debugsolver and performing a dry-run dist-upgrade') + __zypper__(systemd_scope=_systemd_scope()).noraise.call(*cmd_update + ['--debug-solver']) old = list_pkgs() diff --git a/tests/unit/modules/zypper_test.py b/tests/unit/modules/zypper_test.py index fe170b4..56f68b6 100644 --- a/tests/unit/modules/zypper_test.py +++ b/tests/unit/modules/zypper_test.py @@ -359,6 +359,13 @@ class ZypperTestCase(TestCase): zypper_mock.assert_any_call('dist-upgrade', '--auto-agree-with-licenses', '--dry-run') zypper_mock.assert_any_call('dist-upgrade', '--auto-agree-with-licenses', '--dry-run', '--debug-solver') + with patch('salt.modules.zypper.list_pkgs', MagicMock(side_effect=[{"vim": "1.1"}, {"vim": "1.1"}])): + ret = zypper.upgrade(dist_upgrade=True, dryrun=True, fromrepo=["Dummy", "Dummy2"], novendorchange=True) + self.assertTrue(ret['result']) + self.assertDictEqual(ret['changes'], {}) + zypper_mock.assert_any_call('dist-upgrade', '--auto-agree-with-licenses', '--dry-run', '--from', "Dummy", '--from', 'Dummy2', '--no-allow-vendor-change') + zypper_mock.assert_any_call('dist-upgrade', '--auto-agree-with-licenses', '--dry-run', '--from', "Dummy", '--from', 'Dummy2', '--no-allow-vendor-change', '--debug-solver') + with patch('salt.modules.zypper.list_pkgs', MagicMock(side_effect=[{"vim": "1.1"}, {"vim": "1.2"}])): ret = zypper.upgrade(dist_upgrade=True, fromrepo=["Dummy", "Dummy2"], novendorchange=True) self.assertTrue(ret['result']) -- 2.10.1 ++++++ salt-2016.3.2.tar.gz -> salt-2016.3.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/salt/salt-2016.3.2.tar.gz /work/SRC/openSUSE:Factory/.salt.new/salt-2016.3.4.tar.gz differ: char 5, line 1 ++++++ travis.yml ++++++ language: python python: - '2.6' - '2.7' before_install: - sudo apt-get update - sudo apt-get install --fix-broken --ignore-missing -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" swig rabbitmq-server ruby python-apt mysql-server libmysqlclient-dev - (git describe && git fetch --tags) || (git remote add upstream git://github.com/saltstack/salt.git && git fetch --tags upstream) - pip install mock - pip install --allow-external http://dl.dropbox.com/u/174789/m2crypto-0.20.1.tar.gz - pip install --upgrade pep8 'pylint<=1.2.0' - pip install --upgrade coveralls - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2 ordereddict; fi" - pip install git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting install: - pip install -r requirements/zeromq.txt -r requirements/cloud.txt - pip install --allow-all-external -r requirements/opt.txt before_script: - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pylint --rcfile=.testing.pylintrc salt/ && echo 'Finished Pylint Check Cleanly' || echo 'Finished Pylint Check With Errors'" - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pep8 --ignore=E501,E12 salt/ && echo 'Finished PEP-8 Check Cleanly' || echo 'Finished PEP-8 Check With Errors'" script: "sudo -E /home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/python setup.py test --runtests-opts='--run-destructive --sysinfo -v --coverage'" after_success: - coveralls notifications: irc: channels: "irc.freenode.org#salt-devel" on_success: change on_failure: change