9 Commits

Author	SHA1	Message	Date
Erik Johnson	e32644f275	Update state unit tests to use new orchestration_jid param	2016-07-29 12:17:59 -05:00
rallytime	39b49621ad	Merge branch '2015.8' into 'develop' ... Conflicts: - salt/beacons/service.py - salt/cloud/clouds/vmware.py - salt/modules/file.py - salt/modules/ipset.py - salt/modules/npm.py - salt/modules/rpm.py - salt/states/file.py - salt/utils/event.py - salt/utils/schedule.py - tests/unit/modules/state_test.py	2016-01-14 13:33:53 -07:00
Mike Place	2c62b464b1	Accept whatever comes into hightstate mock for state tests	2016-01-12 11:30:25 -07:00
Mike Place	70681bf03b	Fix for mock state PR #30118	2016-01-06 15:10:19 -07:00
Mike Place	180582a523	Fix for mock state PR #30118	2016-01-06 14:01:43 -07:00
Erik Johnson	bacc76c355	Update mocked objects for state module tests ... Added the new pillar_enc value	2015-09-22 08:25:51 -05:00
rallytime	3ce1cef592	Fix Python 2.6 syntax error in unit.modules.state_test.py	2015-04-21 11:01:33 -06:00
Justin Findlay	3d2221ded4	fix test_sls_id unit test	2015-04-15 12:53:50 -06:00
Rahul Handay	83aa84c2a7	Adding state.py unit test	2015-04-15 13:01:36 +05:30