saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
121849 commits 34 branches 292 tags 803 MiB
Commit graph

28 commits

Author SHA1 Message Date
Daniel A. Wozniak
9f1647d0f6 Merge branch '3006.x' into merge/3007.x/3006.x 2025-01-29 15:22:23 -07:00
Barney Sowood
955529f1c0 Update test_gem to set gem_binary to "gem.cmd 
Updates tests/integration/modules/test_gem.py to pass
gem_binary="gem.cmd" to the gem module on windows. Although just using
"gem" on the commandline works, from the module, via cmd.run_all it
doesn't.
 2025-01-20 02:37:15 -07:00
Pedro Algarvio
fd800f57f1
Merge 3006.x into 3007.x 2024-02-14 08:56:16 +00:00
Pedro Algarvio
beb2c6d7b4 Some more test timeout updates 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2024-02-08 21:44:04 +00:00
Daniel A. Wozniak
4baea1a97b Remove vendored tornado 2023-05-23 14:41:30 -07:00
Pedro Algarvio
9cf6b752e0 Replace the usage of @skipIf(...) 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
4d49013247 Update to isort 5.10.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-08-01 12:49:16 -06:00
Pedro Algarvio
75e9655d10 Replace @slowTest with @pytest.mark.slow_test 2021-02-03 06:30:11 +00:00
Pedro Algarvio
967d26a7fc Replace @destructiveTest with @pytest.mark.destructive_test 2021-02-02 18:19:15 +00:00
Pedro Algarvio
46c34869a4 Drop Py2 and six on tests/integration/modules/test_gem.py 2021-02-01 10:51:39 +00:00
Pedro Algarvio
2209c25bf9 Add --run-slow flag to runtests.py 2020-05-07 13:09:02 -07:00
Wayne Werner
332f129e90
Skip slowest tests 2020-04-21 11:23:32 -05:00
Pedro Algarvio
6ba04cc7da
Add windows test whitelisting as pytest markers 
Taken out from the pytest migration PR
 2020-04-16 16:57:59 +01:00
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
Daniel A. Wozniak
4a46f3e3b4
Use vendored tornado instead of system tornado 2020-01-24 19:12:01 +00:00
Pedro Algarvio
0a3df2c5b6
No global variables and cleanup 2019-12-06 12:41:17 +00:00
Daniel A. Wozniak
95ce288ab8
Fix ruby gems tests, again 2019-02-19 14:14:03 -07:00
Gareth J. Greenaway
b3c1be27fb
Tier two unicode updates for modules, states and related tests. 2018-01-25 11:59:25 -08:00
rallytime
6ca3607770 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/modules/win_pkg.py
  - salt/utils/versions.py
 2017-08-18 09:28:26 -04:00
Daniel Wallace
ba80a7d4b5 use a ruby gem that doesn't have dependencies 2017-08-17 13:45:10 -06:00
Daniel Wallace
0a1f40a664 test with gem that appears to be abandoned 2017-08-17 10:38:32 -06:00
Erik Johnson
3184168365 Use explicit unicode strings + break up salt.utils 
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.

A summary of the changes in this PR is as follows:

* Moves the following functions from `salt.utils` to new locations
  (including a deprecation warning if invoked from `salt.utils`):
  `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
  `dequote`, `is_hex`, `is_bin_str`, `rand_string`,
  `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
  `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
  `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
  `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
  `is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
  `salt/utils/__init__.py` for better organization, so we can keep the
  deprecated ones separate from the ones yet to be deprecated as we
  continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
  unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
  import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
  accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
  such that it returns a string matching the passed size. Previously
  this function would get `size` bytes from `os.urandom()`,
  base64-encode it, and return the result, which would in most cases not
  be equal to the passed size.
 2017-08-08 13:33:43 -05:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly. 2017-04-28 13:33:35 +01:00
Pedro Algarvio
7480a8e5fb
Check status on setUp not on the module level @skipIf decorator 2017-04-28 13:33:34 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt. 
Let's drop the salttesting dependency cycle.
 2017-02-28 22:52:49 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Renamed from tests/integration/modules/gem.py (Browse further)