valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
72,450 Commits 24 Branches 182 Tags 341 MiB
dfac0dec9f
Commit Graph

4496 Commits

Author SHA1 Message Date
Mike Place
dfac0dec9f Merge pull request #35368 from rallytime/file-module-deprecations 
Remove contains_regex_multiline function from file module
 2016-08-11 09:36:02 +09:00
rallytime
102fcbe916 Remove contains_regex_multiline function from file module 2016-08-10 16:43:49 -06:00
rallytime
f37255ed16 Move remaining blockdev func unit tests to disk unit tests and delete file 2016-08-10 16:32:14 -06:00
Jeffrey 'jf' Lim
921be89d32 Add unit tests for sys.list_renderers 2016-08-10 09:13:08 +08:00
Jeffrey 'jf' Lim
ea23f7d27d Fix bug in sys.list_returners (all non-glob arguments return empty) 2016-08-10 08:43:47 +08:00
Jeffrey 'jf' Lim
70ae9704a0 Fix bug in sys.list_runners (all non-glob arguments return empty) 2016-08-10 08:30:30 +08:00
Jeffrey 'jf' Lim
af19c762f2 Fix up sysmod_test.py unit test file: 
- take a stab at actual mocking
- general fix of tests, including for all *_doc tests
 2016-08-10 04:04:47 +08:00
Morrie Winnett
04acb5657b Add initial win_iis unit tests 2016-08-09 01:25:43 -07:00
Mike Place
715dc14b9b Merge pull request #35247 from rallytime/carbon-deprecations 
Remove some of the things that are deprecated in Carbon
 2016-08-09 09:00:27 +09:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -06:00
Mike Place
5509df911f Merge pull request #35270 from jf/exact_matching_for_sys.list_x_functions 
Exact matching for sys.list_x_functions
 2016-08-09 01:43:08 +09:00
Mike Place
5ffbd852c6 Merge pull request #35184 from rallytime/py3-unit-state-service-test 
PY3: Don't use contextlib.nested - it is deprecated.
 2016-08-09 01:39:10 +09:00
rallytime
4835c31f23 Remove tests for deprecated functions 2016-08-08 09:58:37 -06:00
rallytime
86a5e04417 Pylint fix 2016-08-08 09:53:29 -06:00
Jeffrey 'jf' Lim
474ce496eb Fix linting problem ('at least two spaces before inline comment') 2016-08-08 23:28:52 +08:00
Jeffrey 'jf' Lim
ad1ce91d20 Fix sys.list_returner_functions glob matching (#35255), and also allow it to 
do exact matching for function names
 2016-08-08 20:16:08 +08:00
Pablo Suárez Hernández
18700e821e unit tests for rpm.checksum() and zypper.download() 
lint issue fixed
 2016-08-08 11:57:14 +01:00
Jeffrey 'jf' Lim
225d9ff915 Allow sys.list_runner_functions to do exact matching for function names 2016-08-07 14:16:13 +08:00
Jeffrey 'jf' Lim
3491e5dcfa Allow sys.list_{,state_}functions to do exact matching for function names 
Note that this deprecates the matching of sys when provided "sys."
("sys" already works; just use that!).
 2016-08-07 14:16:13 +08:00
Mike Place
afe50c7fc8 Fixup VMWare PR 
Refs #35099
 2016-08-07 07:50:28 +09:00
Mike Place
b778760a30 Merge pull request #35099 from Antillion/salt-cloud-esx_5_5-fixes 
Salt cloud esx 5 5 fixes
 2016-08-07 07:44:41 +09:00
Mike Place
6714e8f386 Fix mock call in disk wipe test 2016-08-07 06:57:20 +09:00
Mike Place
6e7f907d36 Merge pull request #35179 from rallytime/py3-unit-template-tests 
PY3: Fixup jinja template unit tests
 2016-08-07 06:48:51 +09:00
Jeffrey 'jf' Lim
06c2407f8d (a la #33775) allow for sys.list_state_modules to do exact matching too 2016-08-04 17:26:49 +08:00
Jeffrey 'jf' Lim
176653eded s/list_modules/list_functions in sysmod_test.py 2016-08-04 12:38:45 +08:00
rallytime
f42ca4b576 PY3: Don't use contextlib.nested - it is deprecated. 
contextlib.nested is deprecated in Python 3. Instead of having two
different ways of handling nested (PY2) vs ExitStacks (PY3), just use
nested with statements for both.
 2016-08-03 14:49:24 -06:00
rallytime
c7c9e3b64b PY3: Fixup jinja template unit tests 2016-08-03 12:45:29 -06:00
Oliver Tupman
af0e0ac165 Resolves issue where no image or clonefrom gives image log error, along with a test for it 2016-08-03 12:16:26 +01:00
Jeffrey 'jf' Lim
dd6ebed1d6 Refactor sys.list_functions 2016-08-03 15:15:47 +08:00
rallytime
72a116b731 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-08-02 13:05:36 -06:00
Mike Place
be42f8857f Fix docker test 
I think this was originally just a typo
 2016-08-03 04:00:33 +09:00
Mike Place
f8a6fb6d68 Merge pull request #35130 from gtmanfred/py3 
Py3 tests for unit.utils
 2016-08-02 12:24:55 -06:00
Mike Place
f7bfc5dd4a Don't run Windows tests on Linux 2016-08-03 01:53:27 +09:00
Mike Place
dd91006ed7 Merge pull request #35120 from kstreee/fix-missing-first-stream-data 
The '_handle_event_socket_recv' function in Salt Api is missing first data of stream.
 2016-08-02 10:22:50 -06:00
Daniel Wallace
09c5088c3c [PY3] fix warnings_test 
maxint is not available in py3.  It was removed, but maxsize can be used
instead.

https://docs.python.org/3.1/whatsnew/3.0.html#integers
 2016-08-02 10:25:35 -05:00
Daniel Wallace
445c7a2c20 [PY3] python3ize schema test 
thirsty is specified as a boolean

need to copy the top level of kwargs so that the dictionary does not
changes size during the loop.
 2016-08-02 10:25:35 -05:00
Daniel Wallace
f5b1769e0b [PY3] bytes for events_test 2016-08-02 10:25:35 -05:00
Oliver Tupman
5b9e618103 Fixes minor whitespace and comment issues 2016-08-02 09:35:19 +01:00
kstreee
28f793caac Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-08-02 07:37:25 +00:00
Jeffrey 'jf' Lim
fe87097abd Round out (unit) test cases for sys.list_{functions,modules} 2016-08-02 12:32:54 +08:00
Jeffrey 'jf' Lim
75816fed93 Address linter issues for tests/unit/states/sysmod.py 
("Exactly one space required after comma")
 2016-08-02 12:09:57 +08:00
Jeffrey 'jf' Lim
84a2512605 Throw in "sys." to the unit test for sys.list_functions too 
(source: integration test for sys.list_functions)
 2016-08-02 12:08:45 +08:00
Jeffrey 'jf' Lim
9df1c9933e Unit tests in place of integration tests for sys.list_{functions,modules} 
NOTE that while I modify test_doc(), this is in order to make it pass.
test_doc() should not be seen as a proper test. Please do a better mock!
 2016-08-02 12:08:45 +08:00
Mike Place
f1fbdf12de Merge pull request #35113 from kraney/boto_iot_thing_types 
Support for aws iot 'thing type'
 2016-08-01 18:33:06 -06:00
Winston Liu
ef97c3f474 added unit tests for thing type present/absent states for boto_iot state functions. 2016-08-01 15:23:51 -07:00
Winston Liu
56b41a5f07 additional unit test to cover newly introduce operations on thing type in boto_iot. 2016-08-01 14:46:56 -07:00
rallytime
a2fbbebe86 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/modules/saltutil.py
  - salt/states/saltmod.py
 2016-08-01 13:42:36 -06:00
Mike Place
8fc2c672eb Merge pull request #35034 from thor/feature/tomcat-version-care 
Fixing the Tomcat state's indifference to a lack of versions and incorrect file paths
 2016-08-01 11:36:48 -06:00
Mike Place
98aad37cd6 Merge pull request #35095 from eradman/localemod 
Properly mock localemod unit tests
 2016-08-01 11:26:21 -06:00
Mike Place
3c58b0237d Merge pull request #35049 from terminalmage/zd868 
Fire events for orchestration jobs containing the passed arguments
 2016-08-01 11:07:04 -06:00