Commit Graph

5 Commits

Author SHA1 Message Date
Erik Johnson
a5d6a3e768 Update pw_user unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
2015-08-17 16:54:16 -06:00
Justin Findlay
7e94989403 mock pwd calls in pw_user exec mod test
Fixes #26266.
2015-08-13 13:20:11 -06:00
Pedro Algarvio
0120acab0e Py3 compatibility 2015-01-30 22:27:07 +00:00
Rupesh Tare
255d107d36 added test cases for pw_user module 2014-12-19 18:51:13 +05:30