 Pedro Algarvio
|
4758f82eb5
Mark slow tests
|
4 tahun lalu |
|
Pedro Algarvio
|
37c8256a29
Upgrade to pytest-salt-factories 0.10.x
|
4 tahun lalu |
|
Pedro Algarvio
|
2941634f1c
Replace `@skip_if_not_root` with `@pytest.mark.skip_if_not_root`
|
4 tahun lalu |
|
Pedro Algarvio
|
6ba04cc7da
Add windows test whitelisting as pytest markers
|
4 tahun lalu |
|
Blacken Salt
|
0b2a5613b3
Blacken salt
|
4 tahun lalu |
|
Daniel Wozniak
|
8bcf845c5e
Merge pull request #55052 from garethgreenaway/55019_fileclient_ftp_port_fix
|
4 tahun lalu |
|
Pedro Algarvio
|
6fca5e5098
Fix PyLint `arguments-differ`
|
5 tahun lalu |
|
Daniel A. Wozniak
|
5b8bc65d9b
Fix typo
|
5 tahun lalu |
|
Daniel A. Wozniak
|
b9ec84a166
Less flaky test_get_url_https_no_dest test
|
5 tahun lalu |
|
Daniel Wozniak
|
6f725466d7
Merge branch 'master' into 55019_fileclient_ftp_port_fix
|
5 tahun lalu |
|
ch3ll
|
33bc5bd840
Merge remote branch 'upstream/master' into mf-master
|
5 tahun lalu |
|
Daniel Wozniak
|
3fea677d85
Merge branch 'master' into 55019_fileclient_ftp_port_fix
|
5 tahun lalu |
|
Pedro Algarvio
|
ac0db895ab
Prefer `RUNTIME_VARS` usage
|
6 tahun lalu |
|
Megan Wilhite
|
8db5802587
Merge branch 'master' into mf-master
|
5 tahun lalu |
|
Gareth J. Greenaway
|
7cafdd3066
When an FTP URL is passed along to cp.get_url when urlparse parses the URL the port attribute ends up as None. The comparison that then takes place in ftplib errors out when comparing a None type to an int. This PR checks to see if the port is valid and if not sets it to the default FTP port.
|
5 tahun lalu |
|
Ch3LL
|
355551c83b
Merge remote-tracking branch 2018.3 into master
|
5 tahun lalu |
|
Gareth J. Greenaway
|
2803105a2d
Porting PR #54154 to 2019.2.1
|
5 tahun lalu |
|
Gareth J. Greenaway
|
1974f110bc
Disabling a couple more tests in integration.modules.test_cp that hang on OS X and Py2.
|
5 tahun lalu |
|
Gareth J. Greenaway
|
1d4e228f15
Updating various skips for tests to only skip if OS is OS X and Python is Python2.
|
5 tahun lalu |
|
Gareth J. Greenaway
|
01dafdc6fc
Skipping integration.modules.test_cp.CPModuleTest.test_get_file_str_https on OS X
|
5 tahun lalu |
|
Pedro Algarvio
|
3e9d22abb1
Merge branch '2017.7' into 2018.3
|
5 tahun lalu |
|
Daniel A. Wozniak
|
0ce086d13d
Fix remaining failures on ubuntu 1404 and add to PR tests
|
5 tahun lalu |
|
Daniel A. Wozniak
|
6648bf25ab
fix linter
|
5 tahun lalu |
|
Daniel A. Wozniak
|
8a84050089
Cherry-pick test fix
|
5 tahun lalu |
|
Daniel A. Wozniak
|
b23c865c15
Fix remaining failures on ubuntu 1404 and add to PR tests
|
5 tahun lalu |
|
twangboy
|
9464af259a
Skip test_getI_file_templated_paths on Windows/Py3
|
5 tahun lalu |
|
Erik Johnson
|
1fde50d84a
Mark integration.modules.test_cp.CPModuleTest.test_get_file_str_https as flaky
|
6 tahun lalu |
|
rallytime
|
2317b5ef58
Merge branch '2017.7' into '2018.3'
|
6 tahun lalu |
|
Daniel A. Wozniak
|
f214929740
Fix a flaky test and mark another as flaky
|
6 tahun lalu |
|
rallytime
|
f7226f400f
Merge branch '2017.7' into '2018.3'
|
6 tahun lalu |
