Commit Graph

12 Commits

Author SHA1 Message Date
C. R. Oldham
db7b675b09 We need one more mocked return from listdir. 2016-02-24 10:15:00 -07:00
Erik Johnson
23b6c08727 Lint fixes for merge-forward 2016-02-12 10:44:18 -06:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
Erik Johnson
8a836c88f4 Update systemd tests 2016-02-01 10:18:08 -06:00
Erik Johnson
15047918a9 systemd test fixes
This removes a bunch of tests that don't test anything (see https://github.com/saltstack/salt/issues/29852).

It also changes some of the tests to reflect recent changes in
systemd.py.
2015-12-18 15:17:38 -06:00
Justin Findlay
9a4959a42b systemd module: new unit test for available 2015-11-19 13:29:08 -07:00
Evgeny Vereshchagin
31ac42cac3 Fix service.{start,restart,reload,force-reload} for masked services 2015-08-18 00:57:52 +00:00
Evgeny Vereshchagin
ab4d6e5323 Fix service.enable for masked services 2015-08-17 14:00:20 -06:00
Mathieu Le Marec - Pasquet
46f703348a fix centos tests 2015-04-25 18:47:20 +02:00
Mathieu Le Marec - Pasquet
3df3d67fd1 consistent mock usage 2015-04-25 13:04:49 +02:00
Mathieu Le Marec - Pasquet
8f9ddbbb68 add some tests for ubuntu/systemd 2015-04-25 12:59:56 +02:00
Rahul Handay
c50b842c66 Adding systemd.py unit tests 2015-04-01 14:59:16 +05:30