valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,351 Commits 24 Branches 182 Tags 341 MiB
7f326c0c17
Commit Graph

1424 Commits

Author SHA1 Message Date
Jorge Schrauwen
8517e876e4 Phase 2 - salt.states.zfs tests 2018-02-24 13:37:43 +01:00
sjorge@acheron.be
f4bcf5fa71 Phase 2 - salt.states.zpool tests 2018-02-24 13:37:43 +01:00
rallytime
255cc7ffb0
Merge branch 'oxygen' into 'develop' 
No conflicts.
 2018-02-08 11:24:56 -05:00
Erik Johnson
1b78e49e1c
win_path: Do not normalize path to lowercase 
This removes the lowercase normalization and handles case-insensitive
path matches. It also combines local path and system path inspection
into a single helper function in both add() and remove(), for simplicity.

Additionally, the add/remove unit tests have been rewritten to test
a wider array of use cases.
 2018-02-01 10:54:09 -06:00
Erik Johnson
1b5c45a1fd
Add support for negative indexes 2018-02-01 10:54:09 -06:00
Erik Johnson
52ebc31f3d
Add comment regarding PATH handling 2018-02-01 10:54:09 -06:00
Erik Johnson
19d75b8eb9
Improve/remove PATH environment modifications 
- `salt/modules/rbenv.py`: Forces use of str types in the custom env dict
  passed to `cmd.run_all`.
- `salt/modules/syslog_ng.py`: Ditches janky PATH munging in favor of
  the stable and long-existing support built into cmdmod.py
- `salt/modules/win_path.py`: Forces use of str types in path
  modification functions.
- `salt/states/win_path.py`: Completely rewritten. Duplicated code from
  the execution module removed in favor of calls to the execution
  module. Tests junked and 14 new tests written.
- `salt/utils/path.py`: The `which()` function was mistakenly modified
  in 20033ee to inject the directories in the POSIX default path into
  the PATH environment variable (even for Windows!). We never used the
  PATH to find the executables, we simply cycled through the dirs one by
  one and looked for an executable file matching the named path. The
  code that modifies the path is now removed. In addition, `which()` now
  uses `salt.utils.path.join()`, which gracefully handles mismatched
  str and unicode directory components to prevent decode errors.
  `join()` has also been simplified to use `salt.utils.data.decode()` to
  normalize directory components to unicode.
 2018-02-01 10:54:09 -06:00
rallytime
c031a4b535
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2018-01-31 13:15:40 -05:00
Daniel Wallace
c0e72ffd73
fix modjk test 2018-01-29 15:08:00 -07:00
Nicole Thomas
50af1d0641
Merge pull request #45714 from isbm/isbm-oxygen-unicode-S3170 
Move to Unicode (3rd tier, tests)
 2018-01-29 11:17:16 -05:00
rallytime
502f031f60
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2018-01-29 09:37:19 -05:00
Bo Maryniuk
5da83c6265 Lintfix: E9402 (use of black-listed module) 2018-01-29 14:13:45 +01:00
Erik Johnson
604ac80e7f
PY3-compatibility fix after unicode_literals was enabled 2018-01-27 16:30:29 -06:00
Erik Johnson
b1ae012852
Remove unnecessary additional assert 
It looks like this was just written to assert the output of a failed
call to `ip.down`, which raises a KeyError at this point of the test
because it is not within the `with` block in which this function is
mocked.
 2018-01-27 16:30:29 -06:00
Erik Johnson
e2b8ec9255
Merge pull request #45713 from isbm/isbm-oxygen-unicode-S3171 
Move to unicode (3rd tier, tests)
 2018-01-27 15:44:08 -06:00
rallytime
cbf1ed2f97
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/modules/cmdmod.py
 2018-01-26 16:28:01 -05:00
Bo Maryniuk
a0baa21de9 Lintfix: continuation 2018-01-26 14:12:11 +01:00
Bo Maryniuk
fb7c5aa0a8 Lintfix: extra parenthesis 2018-01-26 14:11:50 +01:00
Bo Maryniuk
395edcd573 Remove extra back-slashes 2018-01-26 14:11:28 +01:00
Bo Maryniuk
9319b2b450 Lintfix: continuation 2018-01-26 14:11:01 +01:00
Bo Maryniuk
cfdb92be67 Lintfix: PEP8 - line too long 2018-01-26 14:10:43 +01:00
Bo Maryniuk
558c943602 Fix str() function 2018-01-26 14:10:20 +01:00
Bo Maryniuk
274135ae5e Add unicode_literals and print_function 2018-01-26 14:09:58 +01:00
Bo Maryniuk
b4c5d66637 Add print_function import 2018-01-26 13:43:11 +01:00
Bo Maryniuk
b013fa8dc1 Remove unnecessary backslashes 2018-01-26 13:30:07 +01:00
Bo Maryniuk
84c08dd32b Lintfix: fix doc ident 2018-01-26 13:30:00 +01:00
Bo Maryniuk
87f8538c4d Add unicode_literals 2018-01-26 13:29:40 +01:00
Gareth J. Greenaway
b3c1be27fb
Tier two unicode updates for modules, states and related tests. 2018-01-25 11:59:25 -08:00
Bo Maryniuk
0e3fc11ec4 Fix imports 2018-01-25 17:25:49 +01:00
rallytime
b5fb80e8c3
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - salt/utils/saltclass.py
 2018-01-25 11:21:31 -05:00
Nicole Thomas
2a562243b6
Merge pull request #45541 from terminalmage/py3-tier1 
[PY3] Add unicode_literals to high-priority modules/states
 2018-01-24 16:54:24 -05:00
Nicole Thomas
66a38a1c61
Merge pull request #45601 from DSRCorporation/bugs/unicode_3 
Salt Unicode Update 3rd tier 3rd bunch from DK
 2018-01-24 16:32:29 -05:00
Dmitry Kuzmenko
8916b91aa8
Fixed unit tests. 2018-01-24 20:37:11 +03:00
Erik Johnson
9c86cd627a
[PY3] Add unicode_literals to high-priority modules/states 2018-01-24 10:33:58 -06:00
Nicole Thomas
fa373e658e
Merge pull request #45476 from rallytime/unicode-h 
Add unicode_literals to modules, states, tests (H)
 2018-01-24 09:15:40 -05:00
Nicole Thomas
d5cedf6d81
Merge pull request #45560 from rallytime/unicode-changes-1 
Add unicode_literals to modules, states, and related tests
 2018-01-24 09:13:58 -05:00
Nicole Thomas
189c133ebc
Merge branch 'oxygen' into bugs/unicode_3 2018-01-24 09:11:23 -05:00
Nicole Thomas
4423989ac8
Merge pull request #45587 from DSRCorporation/bugs/unicode_2 
Salt Unicode Update 3rd tier 2nd bunch from DK
 2018-01-23 17:08:59 -05:00
rallytime
637ec36739
Fix state unit tests for kernelpkg 2018-01-23 15:26:26 -05:00
rallytime
c08c67f3d4
Add unicode_literals to modules, states, and related tests 2018-01-23 15:26:25 -05:00
rallytime
a35cf9ca1e
Add unicode_literals to modules, states, tests (H) 2018-01-23 09:55:46 -05:00
Nicole Thomas
9facc5ede5
Merge pull request #45543 from terminalmage/py3-tier1-2 
[PY3] Add unicode_literals to more high-priority states/modules
 2018-01-23 09:38:21 -05:00
Nicole Thomas
a8dabbc150
Merge branch 'oxygen' into bugs/unicode_2 2018-01-23 07:56:21 -05:00
Nicole Thomas
2cf7a806bc
Merge pull request #45557 from DSRCorporation/bugs/unicode_1 
Salt Unicode Update 3rd tier 1st bunch from DK
 2018-01-23 07:48:11 -05:00
Nicole Thomas
af033f1c93
Merge pull request #45549 from rallytime/unicode-i 
Add unicode_literals to modules, states, tests (I)
 2018-01-22 14:40:11 -05:00
rallytime
af696989c8
Merge branch 'oxygen' into 'develop' 
Conflicts:
  - doc/topics/releases/oxygen.rst
 2018-01-22 12:35:29 -05:00
Erik Johnson
06ec8db7e2
[PY3] Add unicode_literals to more high-priority states/modules 2018-01-22 08:26:28 -06:00
Nicole Thomas
e9c7faa357
Merge pull request #45466 from rallytime/unicode-e 
Add unicode_literals to modules, states, tests (E)
 2018-01-22 08:57:30 -05:00
Dmitry Kuzmenko
9b09d1b2c9
Salt Unicode Update 3rd tier 3rd bunch from DK 2018-01-22 14:38:49 +03:00
Dmitry Kuzmenko
3ee328a28c
Salt Unicode Update 2018-01-22 14:38:24 +03:00