Commit Graph

5 Commits

Author SHA1 Message Date
Pablo Suárez Hernández
ba815dbf76 improvements on groupadd unit tests 2016-06-03 13:17:13 +01:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
2015-08-25 13:55:44 -06:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
2015-08-21 21:35:11 -05:00
Pedro Algarvio
6f61a08485 Py3 compatibility 2015-01-30 22:27:07 +00:00
Jayesh
0b1ea591ed unit test case for groupadd 2014-12-19 12:03:45 +05:30