Commit Graph

18 Commits

Author SHA1 Message Date
Colton Myers
8d450b9acd Remove unused import 2015-08-19 16:38:34 -06:00
Colton Myers
aa3673385d Remove another heavily-mocked test 2015-08-19 16:08:00 -06:00
Colton Myers
2695e3159e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-19 15:05:52 -06:00
Jenkins
9d3f0624b4 Lint 2015-08-19 14:36:23 -06:00
Jenkins
5b7389d80e Fix schedule test error on py26 2015-08-19 14:33:38 -06:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
2015-08-19 11:29:45 -06:00
Colton Myers
38f22875e1 Fix schedule test failures
Includes removal of heavily-mocked test_list and test_reload
2015-08-18 10:48:01 -06:00
Gareth J. Greenaway
ac36c3e979 Two more fixes to unit tests reflecting changes. 2015-08-13 10:53:37 -07:00
Gareth J. Greenaway
22ac074f5d Additional changes to ensure unit tests pass. 2015-08-13 08:21:09 -07:00
Gareth J. Greenaway
89576e870f Updating unit tests to reflect changes to schedule module. 2015-08-12 17:44:37 -07:00
Gareth J. Greenaway
56ee5b707c updating unit tests to reflect changes. 2015-06-12 21:56:58 -07:00
Gareth J. Greenaway
a09f0b23bd Updating schedule unit tests to align with refactoring changes. 2015-05-22 09:17:53 -07:00
Colton Myers
ed3a71dc72 Fix scheduleadd test 2015-05-19 09:53:01 -06:00
Gareth J. Greenaway
503bd89b59 lint 2015-04-22 22:02:49 -07:00
Gareth J. Greenaway
58bce28f14 fixing various things that caused unit tests to fail. updating unit tests based on code changes 2015-04-22 21:30:58 -07:00
Justin Findlay
257a1abc5e decrease specificity in schedule.modify unit test
python-2.6 difflib's diff formatting is slightly different from the
formatting generated by the version of difflib python-2.7, so that
detail of the test has been removed.
2015-04-03 12:14:33 -06:00
Jayesh Kariya
07ee9602f4 resolved error. 2015-04-01 18:58:43 +05:30
Jayesh Kariya
2b6eccb75e adding schedule unit test 2015-04-01 18:11:48 +05:30