Commit Graph

73063 Commits

Author SHA1 Message Date
Mike Place
7fc803b4bd Try/except the setup call in tornado test as a workaround pending salt-testing release 2016-08-22 19:08:40 +09:00
Mike Place
a635c0954c Merge pull request #35648 from cachedout/test_wheel_test_fix
Test a fix for the wheel test [WIP]
2016-08-22 19:00:49 +09:00
Mike Place
2708fbc6d2 Lint 2016-08-22 19:00:19 +09:00
sun
79603ca410 just fix salt-syndic's log_level not consistent with salt-master​ 2016-08-22 17:24:19 +08:00
Mike Place
19b77442ee Test a fix for the wheel test
I think that what is happening here is that we're using stale grains from a previous test. This should hopefully refresh them and allow this test to succeed.
2016-08-22 17:13:16 +09:00
Mike Place
14612e9a9a Merge pull request #35647 from cachedout/remove_more_decorators
Switch to using skipIf instead of a custom decorator
2016-08-22 16:37:39 +09:00
Mike Place
5b75786208 Switch to using skipIf instead of a custom decorator 2016-08-22 16:36:51 +09:00
Mike Place
572805b265 Merge pull request #35645 from cachedout/remove_pointless_test_decorator
Remove pointless test decorator
2016-08-22 16:12:53 +09:00
Mike Place
928a5fc3be Lint 2016-08-22 16:12:09 +09:00
Mike Place
034a353689 Use skipIf properly 2016-08-22 16:11:01 +09:00
Mike Place
844a7577db Remove disabled decorator 2016-08-22 16:04:13 +09:00
sun
b7d19b4b42 Fix salt-syndic's log_level not consistent with salt-master​
some parameters of salt-master is covered by default salt-minion(if /etc/salt/minion doesn't exists), such as log_level
2016-08-22 14:49:13 +08:00
Mike Place
d6f86f439b Merge pull request #35643 from cachedout/final_fix_for_wheel
Add final args to disable event printing for wheel
2016-08-22 14:52:17 +09:00
Mike Place
092aa89777 Add final args to disable event printing for wheel 2016-08-22 14:51:47 +09:00
Mike Place
0b4bccfa8f Merge pull request #35642 from cachedout/fix_wheel_typo
Fix typo in wheel (my mistake)
2016-08-22 14:45:52 +09:00
Mike Place
8ab1fbae3e Fix typo in wheel (my mistake) 2016-08-22 14:45:26 +09:00
Mike Place
09d7996cb5 Merge pull request #35639 from cachedout/add_missing_docs
Add missing CLI examples
2016-08-22 13:35:43 +09:00
Mike Place
99d9bc5792 Lint 2016-08-22 13:35:26 +09:00
Mike Place
1c00cd34cf Merge pull request #35641 from cachedout/fixup_quiet_wheel
Fix args err in wheel test
2016-08-22 13:31:54 +09:00
Mike Place
2992bb8abc Fix args err in wheel test 2016-08-22 13:31:23 +09:00
Mike Place
ad433e5024 Merge pull request #35640 from cachedout/quiet_wheel
Support the supression of prints in the wheel module
2016-08-22 13:12:56 +09:00
Mike Place
b4f71e0260 Support the supression of prints in the wheel module
This will clean up all those pesky key output issues in the wheel tests.
2016-08-22 13:11:38 +09:00
Mike Place
7f137835b9 Merge pull request #35626 from cachedout/better_cleanup_for2731
Wrap the test in a try/finally to ensure that the keys get cleaned up.
2016-08-22 12:38:17 +09:00
Mike Place
9248ce07f9 Lint 2016-08-22 12:33:24 +09:00
Mike Place
00a419fdf7 Merge pull request #35629 from cachedout/loosen_wheel_test
Just check for keys, not compare all keys for wheel netapi test
2016-08-22 12:32:11 +09:00
Mike Place
b09fd9c741 Merge pull request #35632 from s0undt3ch/develop
Fix hang on test suite termination
2016-08-22 12:31:08 +09:00
Mike Place
307acc6e55 Merge pull request #35637 from cachedout/nitrogen_release_notes
Add Nitrogen release notes
2016-08-22 12:30:33 +09:00
Mike Place
8d5833424d Add missing CLI examples 2016-08-22 12:26:39 +09:00
Mike Place
96110895e3 Merge pull request #35638 from cachedout/move_jid_queue_to_trace
Move the JID queue logging to trace because it can be very verbose.
2016-08-22 12:01:54 +09:00
Mike Place
70bffab955 Move the JID queue logging to trace because it can be very verbose. 2016-08-22 12:01:09 +09:00
Mike Place
45a12ccaf0 Add Nitrogen release notes and remove deprecation warning for core grains
We can't have a deprecation warning thrown for grains on every single salt-call.
That's just too much. Documenting in the release notes will be fine.
2016-08-22 11:52:01 +09:00
Mike Place
2c267fdbf2 Merge pull request #35636 from cachedout/wheel_test_correct_call
Fix wheel test to call correct wheel function
2016-08-22 11:48:14 +09:00
Mike Place
7e8721b4c2 Fix wheel test to call correct wheel function
This was not causing a test failure because no asserts were being
made but it was throwing exceptions silently. This cleans that up.
2016-08-22 11:44:50 +09:00
Mike Place
9e26942c26 Merge pull request #35635 from cachedout/issue_35623
Fix logic error in ckminions.
2016-08-22 11:41:07 +09:00
Mike Place
ce2070e2a3 Fix logic error in ckminions.
Fixup for #35623
2016-08-22 11:39:01 +09:00
Hengyang Hu
fe338ff41f fix 34922, StopIteration should not throw exception out 2016-08-21 19:03:37 -07:00
Pedro Algarvio
f7693f306c
Apply child processes cleanup counter measure on testprogram too.
Additionally, avoid timeout exceptions with registered atexit calls for testprogram(s)
2016-08-22 00:36:53 +01:00
Pedro Algarvio
a0d47fac40
Don't run routines if _handle_payload is not present 2016-08-22 00:36:53 +01:00
Pedro Algarvio
33a6e75142
Log the cmdline instead. Better nuke approach. 2016-08-22 00:36:47 +01:00
Mike Place
a85ab3e59c Just check for keys, not compare all keys for wheel netapi test 2016-08-21 22:17:27 +09:00
Jeffrey 'jf' Lim
1f818c832e Fix user.present state reporting for groups when remove_groups=false 2016-08-21 20:50:09 +08:00
Mike Place
5733fb7826 Merge pull request #35627 from cachedout/comment_boto_lambda_test
Comment boto lambda test
2016-08-21 21:48:47 +09:00
Mike Place
9757766c71 Better method to skip test. This way we can track it. 2016-08-21 21:47:08 +09:00
Mike Place
ab6ead3e63 This test was doing all sorts of things, raging from simply failing
to driving CPUs to 100%, to leaking memory until the entire test suite crashes.

This seems to happen only in conjunction with running the entire unit test suite
and does not occur on its own

cc: @kraney
2016-08-21 21:43:52 +09:00
Mike Place
ea8fb37b48 Wrap the test in a try/finally to ensure that the keys get cleaned up.
We're seeing the keys appear later on in some tests, such as here:

integration.modules.saltutil.SaltUtilModuleTest.test_wheel_just_function
2016-08-21 20:22:26 +09:00
Mike Place
93182fabdc Merge pull request #35625 from cachedout/fix_more_locale_test
Fix the rest of the locale tests on develop
2016-08-21 16:23:09 +09:00
Mike Place
def20eb95d Fix the rest of the locale tests on develop
Bad mocks
2016-08-21 16:22:09 +09:00
Mike Place
d4a116cf93 Merge pull request #35624 from cachedout/fix_event_modifier
Fix case where the printer functions would modify the event system
2016-08-21 15:31:07 +09:00
Mike Place
96cd9f0a7d Fix case where the printer functions would modify the event system
There was a case where the printer func passed into NamespacedEvent
could modify the data which was then passed onto the event bus. This,
in turn, would do things like converting ints to strings. This,
in turn, would then break when the master picked up the data on the
other end of the event bus and did things like pass that data to the
outputter system which was (in this case) expecting an int.

Resolves this test case: integration.runners.state.StateRunnerTest.test_orchestrate_output
2016-08-21 15:27:50 +09:00
Mike Place
166029abd3 Merge pull request #35623 from cachedout/fixup_34954
Still check for minions in cache list
2016-08-21 13:54:31 +09:00