rallytime
b80ef26cf2
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/cli/batch.py
- salt/minion.py
- salt/modules/cassandra_cql.py
- salt/modules/rsync.py
2016-08-23 10:44:55 -06:00
rallytime
f2eb625778
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-08-19 11:13:15 -06:00
Erik Johnson
beb6ca8ef9
Update linux_sysctl tests to reflect new context key ( #35584 )
...
* Update docstring to reflect optional context argument
It used to not be optional.
* Update linux_sysctl tests to reflect new context key
This key was changed in 5b12f03
2016-08-18 20:56:08 -06:00
Eric Radman
bae492ad8f
Fix tests that assert CommandExecutionError ( #32485 )
...
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
2016-04-12 08:41:25 -06:00
Justin Findlay
328d058f22
modules.linux_sysctl unit tests: mock ctl presence
2016-03-10 10:57:20 -07:00
Colton Myers
06e1a4f519
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop2
...
Conflicts:
salt/client/mixins.py
salt/loader.py
salt/modules/localemod.py
salt/modules/pillar.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/__init__.py
salt/states/mount.py
salt/states/ssh_auth.py
2015-02-06 12:09:01 -07:00
Justin Findlay
8eab04bd69
fix linux_sysctl_test failures caused by #20314
2015-02-03 11:30:27 -07:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Justin Findlay
26094b39b4
pylint fix on linux_sysctl_test.py
2014-10-31 12:41:04 -06:00
Justin Findlay
106f645c9e
adding tests for modules/linux_sysctl.py
2014-10-31 10:16:41 -06:00
