Daniel A. Wozniak
80651d3030
Fix linter
2019-09-03 20:47:10 +00:00
Wayne Werner
982ed3d793
Delete bad API token files
...
Under the following conditions and API token should be considered
invalid:
- The file is empty.
- We cannot deserialize the token from the file.
- The token exists but has no expiration date.
- The token exists but has expired.
All of these conditions necessitate deleting the token file. Otherwise
we should simply return an empty token.
2019-09-03 20:46:04 +00:00
Daniel Wozniak
11016cedf3
Merge pull request #54376 from dwoz/tmp_token
...
Move tokens in place with an atomic operation
2019-09-03 13:40:49 -07:00
Daniel A. Wozniak
0b28c6059b
Fix linter complaints
2019-09-03 16:59:31 +00:00
Daniel Wozniak
5161203679
Merge pull request #54386 from twangboy/fix_test_win_dacl_2019.2.1
...
Fix unit.utils.test_win_dacl (2019.2.1)
2019-09-03 09:57:24 -07:00
twangboy
b8fa7d33a5
Sort the perms
2019-09-03 10:19:53 -06:00
Daniel A. Wozniak
8e33343f67
Move tokens in place with an atomic operation
2019-09-02 00:03:27 +00:00
Daniel Wozniak
b4caaad4a0
Merge pull request #54355 from s0undt3ch/hotfix/test-daemons-2019.2.1
...
[2019.2.1] [GitPillar Tests] Have the started processes log instead of just writing to stdout/stderr
2019-08-29 16:26:49 -07:00
Daniel Wozniak
ce5b109646
Merge pull request #54353 from cmcmarrow/2019_win_system_skip
...
adds @skipIf not windows
2019-08-29 12:33:10 -07:00
Pedro Algarvio
561c0a2317
Have the started processes log instead of just writing to stdout/stderr
2019-08-29 19:40:18 +01:00
Pedro Algarvio
c2a311518c
Don't overwritethe stderr logger
2019-08-29 19:04:25 +01:00
cmcmarrow
8e28074e3b
adds @skipIf not windows
2019-08-29 11:51:27 -06:00
Daniel Wozniak
94c03e563a
Merge pull request #54338 from dwoz/logging_fixup
...
Log server closes completely during shutdown
2019-08-29 10:14:04 -07:00
Daniel Wozniak
490ee69f94
Merge pull request #54327 from garethgreenaway/more_test_program_fixes
...
[2019.2.1] Catch the AccessDenied exception and continue when running under Py3.
2019-08-29 09:59:33 -07:00
Daniel A. Wozniak
a3e227e6c0
Log server closes completely durring shutdown
2019-08-28 15:43:50 -07:00
Gareth J. Greenaway
97b4d86bac
Catch the AccessDenied exception and continue when running under Py3.
2019-08-27 16:17:03 -07:00
Daniel Wozniak
bb911c360f
Merge pull request #54316 from Akm0d/azure-cleanup
...
Azure cleanup
2019-08-27 09:14:08 -07:00
Daniel Wozniak
9334e4e48e
Merge pull request #54314 from garethgreenaway/testprogram_access_denied_do_not_raise
...
[2019.2.1] Do not raise the exception in testprogram.py
2019-08-26 16:59:36 -07:00
Tyler Johnson
2072773341
pass longer timeout to msazure destroyinstance
2019-08-26 17:26:38 -06:00
Tyler Johnson
34eb47717d
Merge branch '2019.2.1' of https://github.com/saltstack/salt into azure-cleanup
2019-08-26 16:51:43 -06:00
Tyler Johnson
7ae48b16ff
Allow azure tests enough time to clean up interfaces
2019-08-26 16:51:36 -06:00
Daniel Wozniak
71fb051258
Merge pull request #54305 from dwoz/winfix
...
Fix wart in test_process tests on windows
2019-08-26 10:59:11 -07:00
Gareth J. Greenaway
a53bacb938
Do not raise the exception if a process can not be access, just continue
2019-08-26 10:44:03 -07:00
Daniel A. Wozniak
4e68860050
Fix wart in test_process tests on windows
2019-08-25 02:09:55 +00:00
Daniel Wozniak
4d80f0aabf
Merge pull request #54303 from dwoz/periodic_cb
...
Fix wart in periodic callback interval
2019-08-24 13:04:34 -07:00
Daniel A. Wozniak
bf5f7de86f
Fix wart in periodic callback interval
2019-08-24 18:58:43 +00:00
Daniel Wozniak
583885149c
Merge pull request #54259 from dwoz/less_forking
...
Call os.fork less to avoid race conditions
2019-08-23 19:12:41 -07:00
Daniel Wozniak
531f3aa457
Merge pull request #54247 from DSRCorporation/2019.2.1_with_multimaster_bb_fixes
...
2019.2.1 with multimaster bb fixes
2019-08-23 13:19:17 -07:00
Daniel A. Wozniak
bf4d0dd965
Fix process list tests on windows py3
2019-08-23 20:01:22 +00:00
Tyler Johnson
b45ae745ad
Clean up azure instances properly
2019-08-23 10:48:20 -06:00
Dmitry Kuzmenko
62cd8cdfcd
Merge branch '2019.2.1' into 2019.2.1_with_multimaster_bb_fixes
2019-08-23 13:50:02 +03:00
Daniel Wozniak
993c3415a5
Merge pull request #54235 from ogd-software/fix_46034-2019.2.1
...
Fix 46034 2019.2.1
2019-08-22 15:32:08 -07:00
Daniel Wozniak
5d1a4d0b3b
Merge pull request #54282 from Akm0d/clean-up-renamed
...
clean up renamed instances in the teardown
2019-08-22 15:13:50 -07:00
Daniel Wozniak
c181f5a633
Merge pull request #54252 from s0undt3ch/hotfix/git-pillar-2019.2.1
...
[2019.2.1] More control on spun test deamons on git pillar tests
2019-08-22 15:13:07 -07:00
Daniel Wozniak
805f0ace6c
Merge branch '2019.2.1' into 2019.2.1_with_multimaster_bb_fixes
2019-08-22 12:53:22 -07:00
Tyler Johnson
11c11179c7
Removed redundant parenthesis
2019-08-22 12:39:14 -06:00
Tyler Johnson
802235d003
don't delete shutting down ec2 instances
2019-08-22 12:22:27 -06:00
Daniel Wozniak
b40cdbfd87
Merge pull request #54214 from Ch3LL/fix_logging
...
Remove unnecessary logging from minion.py
2019-08-22 11:08:24 -07:00
Tyler Johnson
36029428a7
reversed the order in which an instance was renamed
2019-08-22 10:41:50 -06:00
Tyler Johnson
5500ede3e9
renamed _alt_name function
2019-08-22 10:25:46 -06:00
Tyler Johnson
23beab46e7
clean up renamed instances in the teardown
2019-08-22 09:40:25 -06:00
Dmitry Kuzmenko
9d280980a8
Merge branch '2019.2.1' into 2019.2.1_with_multimaster_bb_fixes
2019-08-22 12:54:46 +03:00
Pedro Algarvio
4eb85fac6f
Skip tests on RHEL family < 7
2019-08-22 06:56:00 +01:00
Pedro Algarvio
64a1be88f2
Don't even go through the transport to get the system grains
2019-08-22 06:56:00 +01:00
Pedro Algarvio
d0f8efae3c
Don't keep recreating the git repos. Restore from backup.
2019-08-22 06:56:00 +01:00
Pedro Algarvio
6114e9dcd9
All prep work is done in setUpClass
.
...
Additionally, make sure `tearDownClass` always runs in case of failures
in `setUpClass`.
2019-08-22 06:55:59 +01:00
Pedro Algarvio
5b030dd702
Daemons are now started/stopped on tests, not by salt
2019-08-22 06:55:59 +01:00
Pedro Algarvio
ed60f0d17e
We don't actually need grains
2019-08-22 06:55:59 +01:00
Pedro Algarvio
911446d7c0
Lock uwsgi
requirement.
2019-08-22 06:55:59 +01:00
Daniel A. Wozniak
316ec78ef0
Allow more time for slow test
2019-08-22 04:32:48 +00:00