Commit Graph

7 Commits

Author SHA1 Message Date
rallytime
9220ea0729 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
2016-06-02 10:13:34 -04:00
Pablo Suárez Hernández
eaaef25c79 lint issue fixed 2016-05-26 08:26:24 +01:00
Pablo Suárez Hernández
6b6febb211 unit tests for rpm.checksum() and zypper.download() 2016-05-25 17:08:16 +01:00
Erik Johnson
8b3497b129 Catch exception raised from invalid verify_options (#33317)
* Catch exception raised from invalid verify_options

This fails the state gracefully in these cases.

Refs: 6b97161293 (r63577507)

* Raise an exception when package verification fails

* Catch failed package verification commands

Also, since pkg.verify is run separately on each targeted package, don't
add errors for each failure, just add one error to what we report.

* Update rpm test_verify test to reflect change from cmd.run to cmd.run_all
2016-05-19 12:13:30 -06:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
Bo Maryniuk
f07c7ea792 Add lowpkg tests for version comparison 2016-03-30 17:33:24 +02:00
Jayesh Kariya
93d5a32bd8 adding rpm unit test case 2015-02-19 14:40:10 +05:30