Daniel Wallace
b878f01662
use finally instead of catching baseexception
2018-08-31 10:06:55 -04:00
Daniel Wallace
de98be6093
use rlock so blocking can be passed in py2
2018-08-31 10:06:55 -04:00
Daniel Wallace
d346b42332
import Callable from collections.abc for python3.7
...
https://bugs.python.org/issue25988
2018-08-31 10:06:55 -04:00
Daniel Wallace
d7a410070a
Handle thread shutdown on system exit
...
Handle changes made for https://bugs.python.org/issue18966 in python 3.7
2018-08-31 10:06:55 -04:00
Nicole Thomas
0cda22e7a9
Merge pull request #49449 from rallytime/flaky-test
...
Mark status test as flaky
2018-08-30 14:10:43 -04:00
Nicole Thomas
bcc5f1a7c1
Merge pull request #49444 from rallytime/bp-49299
...
Back-port #49299 to 2018.3.3
2018-08-30 14:10:20 -04:00
Nicole Thomas
38713e2db9
Merge pull request #49448 from rallytime/bp-49400
...
Back-port #49400 to 2018.3.3
2018-08-30 14:04:28 -04:00
Nicole Thomas
d6ddcab351
Merge pull request #49446 from rallytime/bp-49356
...
Back-port #49356 to 2018.3.3
2018-08-30 14:04:00 -04:00
Nicole Thomas
1a67956c0f
Merge pull request #49445 from rallytime/bp-49192
...
Back-port #49192 to 2018.3.3
2018-08-30 14:03:44 -04:00
Nicole Thomas
33f59d44de
Merge pull request #49443 from rallytime/bp-49197
...
Back-port #49197 to 2018.3.3
2018-08-30 14:03:09 -04:00
Nicole Thomas
60758059c3
Merge pull request #49442 from rallytime/bp-49180
...
Back-port #49180 and related fixes to 2018.3.3
2018-08-30 14:02:53 -04:00
Nicole Thomas
1f4906346a
Merge pull request #49441 from rallytime/bp-49240
...
Back-port #49240 to 2018.3.3
2018-08-30 14:02:39 -04:00
Nicole Thomas
cc27b67a37
Merge pull request #49440 from rallytime/bp-49258
...
Back-port #49258 to 2018.3.3
2018-08-30 14:02:25 -04:00
rallytime
0f322bb39f
Mark status test as flaky
2018-08-30 11:34:05 -04:00
rallytime
b953fe0079
Mark pillar refresh test as flaky
2018-08-30 11:24:33 -04:00
Daniel A. Wozniak
8022b0c3d6
Fix tests that use timed_subprocess for py3
2018-08-30 10:52:14 -04:00
Daniel A. Wozniak
20148d4438
Test fixes
...
- Fix tearDown method to remove unicode environment key.
- Mark flaky test as such, test_set_system_time fails when run at
certian times of the day.
2018-08-30 10:50:41 -04:00
Daniel A. Wozniak
b8c5a5bb91
Fix string formatting wart in file state tests
2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
19756022be
Fix wart in file state test
2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
ba68388342
Work around cmd.run unicode issues in test for now
...
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
5fe821978e
File state line ending fixes
2018-08-30 10:44:14 -04:00
Daniel A. Wozniak
e155568957
Fix typo
2018-08-30 10:40:10 -04:00
Daniel A. Wozniak
608a1ae7ba
Account for file renames
2018-08-30 10:39:42 -04:00
Daniel A. Wozniak
e8e6a46a2b
Fix directory unit test
2018-08-30 10:39:37 -04:00
Daniel A. Wozniak
2f865c398e
Fix is_windows checks
2018-08-30 10:39:32 -04:00
Daniel A. Wozniak
6460f7f217
Account for normalized dirs in unit tests
2018-08-30 10:39:28 -04:00
Daniel A. Wozniak
f4b7101a35
Simplify dict keys lookup
2018-08-30 10:39:15 -04:00
Daniel A. Wozniak
942b68bfc8
Fix remaining file state integration tests (py3)
2018-08-30 10:39:05 -04:00
Daniel A. Wozniak
22ed452479
Work around listdir encoding issues on py2 windows
2018-08-30 10:27:45 -04:00
Daniel A. Wozniak
f5be275835
file state test fixes
...
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
this test still fails due to py2 popen's unicode handling.
2018-08-30 10:27:45 -04:00
Daniel Wallace
0191af1423
flaky tests are flaky yo
2018-08-30 10:18:13 -04:00
Daniel Wallace
720b671dda
mark orchestration state tests as flaky
2018-08-30 10:18:12 -04:00
Nicole Thomas
af80e64569
Merge pull request #49368 from rallytime/bp-49322
...
Back-port #49322 to 2018.3.3
2018-08-28 13:15:14 -04:00
Nicole Thomas
0fee3e8786
Merge pull request #49363 from rallytime/bp-49245
...
Back-port #49245 to 2018.3.3
2018-08-28 13:14:17 -04:00
Nicole Thomas
dbcd2fc726
Merge pull request #49361 from rallytime/bp-49244
...
Back-port #49244 to 2018.3.3
2018-08-28 13:12:57 -04:00
Nicole Thomas
b4a1e1d365
Merge pull request #49362 from rallytime/bp-49240
...
Back-port #49240 to 2018.3.3
2018-08-28 13:00:25 -04:00
rallytime
cc606509d0
Fix is_windows call - use the right path
2018-08-28 12:58:11 -04:00
Nicole Thomas
9ca9a775ff
Merge pull request #49365 from rallytime/bp-49270
...
Back-port #49270 to 2018.3.3
2018-08-28 12:56:22 -04:00
Nicole Thomas
bbff57da16
Merge pull request #49364 from rallytime/bp-49243
...
Back-port #49243 to 2018.3.3
2018-08-28 12:55:54 -04:00
Daniel A. Wozniak
238853b9ec
Encode shell commands explicitly.
...
On Windows subprocess.Popen will try to implicity encode shell commands
using the default system encoding. This will raise an exception if
passed utf-8.
2018-08-28 10:26:26 -04:00
Daniel A. Wozniak
1b3f37a8b8
Add async helper to test_sock_path_len
...
This test function is causing another test:
unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription
To fail with 'Async operation timed out after 5 seconds', Adding the
tornado Async test helper so that both tests pass.
2018-08-28 09:30:47 -04:00
Daniel A. Wozniak
5db77c6229
Revert newline translation change
...
On windows, newlines will be CRLF since we added unix2dos to kitchen.
2018-08-28 09:28:58 -04:00
Daniel A. Wozniak
5488fbea38
Skip grep unit tests on windows
...
These tests are specific to unix like platforms that have grep
installed. On windows we use the win_file module.
2018-08-28 09:26:35 -04:00
Daniel A. Wozniak
16ca5b9694
Work around listdir encoding issues on py2 windows
2018-08-28 09:24:16 -04:00
Daniel A. Wozniak
7650208dbc
file state test fixes
...
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
this test still fails due to py2 popen's unicode handling.
2018-08-28 09:24:16 -04:00
Daniel A. Wozniak
e0909d3a25
Simplify by using to_unicode helper
2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
4723c69092
Older GitPython version do not have a close method
2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
d5fecba716
Fix up fileserver.test_gitfs tests on windows
2018-08-28 09:22:19 -04:00
Daniel A. Wozniak
4b688f6347
Remove unicode filenames on windows python 2
...
Need to provide unicode to shutil in order to retrieve and delete
unicode.
2018-08-28 09:22:19 -04:00
Daniel Wozniak
74b78835b3
Merge pull request #49347 from Ch3LL/bp_49345_2018.3.3
...
[2018.3.3] Backport #49345
2018-08-27 18:53:59 -07:00