valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,060 Commits 24 Branches 182 Tags 341 MiB
2b1ad9e9b9
Commit Graph

8071 Commits

Author SHA1 Message Date
Bo Maryniuk
4dc45f2509 Add grains unit test for Ubuntu systems 2016-08-05 11:55:02 +02:00
rallytime
807c1729ba PY3: Use assertCountEqual instead of assertItemsEqual 
assertItemsEqual is deprecated in Python 3 and replaced by assertCountEqual
 2016-08-04 15:13:08 -06:00
rallytime
2d5d5fe7f9 Don't try to hash unicode strings in PY3 
Avoids: TypeError: Unicode-objects must be encoded before hashing
 2016-08-04 15:13:08 -06: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
Erik Johnson
9938c4ba0d Make integration.loader.loader tests PY3-compatible 
Note that the LazyLoader still doesn't work quite right, the tests still
fail. But, this resolves Python 3 incompatibility issues.
 2016-08-03 17:21:31 -05: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
Mike Place
db68d2cacb Merge pull request #35037 from twangboy/int_tests_sysmod 
Fix sysmod integration tests on Windows
 2016-08-03 07:59:00 -06:00
Mike Place
99bd7b7e3c Merge pull request #35151 from terminalmage/py3tests-integration-output 
Fix integration.output tests for PY3
 2016-08-03 07:46:16 -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
twangboy
8626a20942 Add missing docs and cli examples 2016-08-02 17:33:20 -06:00
twangboy
b00b3c4e65 Fix tests 2016-08-02 17:33:20 -06:00
Mike Place
59dbb05db6 Disable init script test temporarily 
This will be re-enabled later on.
 2016-08-03 07:40:30 +09:00
Mike Place
c69643d4ef Fix error in passing timeout for salt tests 2016-08-03 07:30:09 +09:00
Erik Johnson
5d40ffff01 Use a path that non-root users can write to for output file 2016-08-02 17:25:22 -05:00
rallytime
f76cf617a7 Pylint fix 2016-08-02 14:23:20 -06:00
rallytime
72a116b731 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-08-02 13:05:36 -06:00
Mike Place
9d7c22e1cb Merge pull request #35143 from cachedout/fix_docker_test 
Fix docker test
 2016-08-02 13:02:52 -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
2b7b4eb4ca Fix wheel test 
This aligns with the new test layout
 2016-08-03 03:53:15 +09:00
Mike Place
b3fa25c2ab Merge pull request #35141 from cachedout/fix_batch_tests 
Remove py3 distinction in batch test
 2016-08-02 12:39:40 -06:00
Mike Place
324fdd121f Remoe py3 fix/shell/salt.utils.event 2016-08-03 03:38:35 +09:00
Mike Place
49a2292e4c Merge pull request #35140 from cachedout/fix_batch_tests 
More liberal matching for batch tests
 2016-08-02 12:34:13 -06:00
Mike Place
4df8b32509 More liberal matching for batch tests 
Fixes test failures currently in develop
 2016-08-03 03:32:03 +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
69961fb2a5 Merge pull request #35101 from jtand/saltutil_test_fixes 
Check return dict on saltutil integration test
 2016-08-02 12:07:55 -06:00
Mike Place
f7bfc5dd4a Don't run Windows tests on Linux 2016-08-03 01:53:27 +09:00
Justin Anderson
8517ec9458 accurately check return dict 2016-08-02 10:39:21 -06:00
Justin Anderson
cc036ac907 fix test_wheel_with_kwarg 2016-08-02 10:39:21 -06: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
Dmitry Kuzmenko
b50d85a154 Properly remove minion_test_issue_2731 key. 2016-08-02 14:47:51 +03:00
Mike Place
6994825b3d Merge pull request #35015 from DSRCompany/features/8705_run_and_key_eauth 
#8705 run and key eauth
 2016-08-02 02:47:27 -06:00
Mike Place
cfc66b848e Merge pull request #35115 from cachedout/fix_state_sync 
Sync before state tests
 2016-08-02 02:46:50 -06:00
Oliver Tupman
5b9e618103 Fixes minor whitespace and comment issues 2016-08-02 09:35:19 +01:00
Mike Place
2743e01d9b Merge pull request #35116 from rallytime/py3-int-shell-tests 
PY3: Fix some string encoding problems in shell integration tests
 2016-08-02 02:05:30 -06:00
Mike Place
57e6ea5e51 Merge pull request #35064 from twangboy/int_tests_useradd 
Add useradd integration tests for Windows
 2016-08-02 01:59:33 -06:00
Mike Place
e058be0c3b Fix typo 2016-08-02 01:45:48 -06: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
Dmitry Kuzmenko
1d606e71c8 Fixed pylint error. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
42ef411c82 Updated salt-key test. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
b412e7814a Fixed salt-run integration tests. 2016-08-02 10:01:01 +03: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
8ab96d9b50 Remove integration tests for sys.list_{functions,modules} 2016-08-02 12:09:56 +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
rallytime
d787140861 Make some adjustments after resolving merge conflict 2016-08-01 18:32:28 -06:00
Mike Place
b5e556f3a3 Sync before state tests 2016-08-01 18:26:18 -06:00
rallytime
1f45d906c8 PY3: Fix byte string encoding issues when running shell.master int tests 2016-08-01 18:03:48 -06:00
rallytime
fbe87fbb4a PY3: Fix byte string encoding issues when running shell.proxy int tests 2016-08-01 18:03:48 -06:00
rallytime
f47e2f9399 PY3: Fix byte string encoding issues when running shell.minion int tests 2016-08-01 18:03:48 -06:00
Mike Place
4587a3112f Merge pull request #35035 from plastikos/test-cli_exit_status 
Test CLI exit status
 2016-08-01 16:24:55 -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
twangboy
8eb97d08be Remove whitespace 2016-08-01 14:08:52 -06: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
Thayne Harbaugh
c6d08bf31b Minor tweaks to testing exit codes 
* shared config settings go in `config_base` rather than *each* config
* Ensure that `name` attribute is a string
* Ensure that `dirtree` gets used from kwargs
* Adding 'XXXX' to the mkdtemp template is unnecessary
* Only template values if they are strings - otherwise just use them directly
 2016-08-01 11:20:15 -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
Oliver Tupman
922163be2a Adds tests for changes, plus a small refactor to remove a comment 2016-08-01 17:06:57 +01:00
Oliver Tupman
3b79c7c36d Quick refactor to remove duplication and add a test for config validation failure 2016-08-01 17:06:57 +01:00
Oliver Tupman
e37a8e98bd Adds simple, if verbose test to validate the image/clonefrom settings 2016-08-01 17:06:57 +01:00
Eric Radman
80f8b87ce3 Properly mock localemod unit tests 
locale_gentoo* unit tests only pass on Linux systems because the
localedef is in the search path.
 2016-08-01 11:26:13 -04:00
Mike Place
d137c4b986 Merge pull request #34955 from lubyou/fix-dism-on-non-english-systems 
force dism to always output english text
 2016-08-01 06:54:03 -06:00
Mike Place
9bf9edb0e0 Merge pull request #35071 from terminalmage/issue35065 
Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
 2016-08-01 06:52:40 -06:00
Jeffrey 'jf' Lim
17a230a2e5 Tighten up test_list_modules_with_arg: should include "assertNotIn" too 2016-07-31 02:16:45 +08:00
Erik Johnson
bd4d1d31a0 Add nodegroup_comp unit tests 2016-07-29 19:28:52 -05:00
twangboy
8e83757c78 Fix test_add_user_to_group 2016-07-29 12:07:14 -06:00
Thayne Harbaugh
5816463eae Corrections to proxy testing: 
* Ensure that the --config_dir argument is passed when "verbatim_args" is set
* Ensure that the user option is set to "unknown" for both proxy and minion configurations
 2016-07-29 11:57:54 -06:00
twangboy
35017d7241 Add useradd integration tests for Windows 2016-07-29 11:30:34 -06:00
Erik Johnson
e32644f275 Update state unit tests to use new orchestration_jid param 2016-07-29 12:17:59 -05:00
Mike Place
ec821510bf Merge pull request #34909 from twangboy/int_tests_beacons 
Add check for admin on Windows, gated
 2016-07-29 10:39:28 -06:00
twangboy
2cb5787bad Remove linux gate 2016-07-29 10:24:29 -06:00
twangboy
402901aff0 Add check for admin on Windows, gated 2016-07-29 10:20:45 -06:00
Mike Place
4fe3397a41 Merge pull request #34921 from tonybaloney/quickstart 
Introduce a template system for extending SaltStack open
 2016-07-28 22:38:10 -06:00
Thayne Harbaugh
8a700b54f8 Appease the pylint gods: lambdas 2016-07-28 15:20:25 -06:00
Thayne Harbaugh
c37bafaca1 Appease the pylint gods. 2016-07-28 14:50:53 -06:00
Mike Place
66127f277b Merge pull request #35005 from twangboy/int_tests_state 
Fix state execution module integration tests for Windows
 2016-07-28 13:37:54 -06:00
Mike Place
9adfa4a651 Merge pull request #34972 from twangboy/int_tests_hosts 
Fix hosts integration tests for Windows
 2016-07-28 13:36:11 -06:00
Thor K. H
7f6942ec7f Fixing coding style and change w/o updated test 
Fixed testing for tomcat.wait, as well as updating style. Should resolve
any test errors isolated to the module and/or state.
 2016-07-28 21:24:52 +02:00
Thor K. H
bb38055ae4 Initial work on adapting Tomcat to care correctly 
Ensure that lack of version does not result in blank version being used,
as to avoid certain Java EE applications from having issues with paths
when parallell execution is not "supported".

This fixes #24990 by both not adding a blank version if there is no
version to exract, but also by allowing you to overwrite that there
should be *no* version whether or not your WAR-file ends with `-1.2.3`.

Tests added for specifically dealing with no-to-version scenarios,
as well as several minor documentation tweaks that hopefully aren't too
interruptive!
 2016-07-28 20:02:57 +02:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/schedule.py
 2016-07-28 11:08:14 -06:00
rallytime
65f9365ee0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-28 11:05:54 -06:00
twangboy
1607da0841 Better fix 2016-07-28 09:48:09 -07:00
twangboy
5ca2f15664 Fix test_issue_1896... for Linux 2016-07-28 09:33:23 -07:00
Eric Radman
42222b06fe Remove stray debug print statements (#35019) 
This cleans up the unit test output a bit, mostly leaving deprecation warnings.
 2016-07-28 09:17:27 -06:00
Nicole Thomas
812916b45f Fix rabbitmq_user state test to check for correct string (#35007) 
This test was failing when I ran it locally - I'm not sure why the
error isn't showing up in Jenkins, but I double checked the string
in the state and there should be single-quotes around the user name.
 2016-07-28 08:37:37 -06:00
Anthony Shaw
87954a2baf
add newline to test 2016-07-28 12:44:01 +10:00
Anthony Shaw
bc528eb4d0
completed test to check files, names and contents 2016-07-28 11:52:16 +10:00
Anthony Shaw
b7257baade
add test class 2016-07-28 11:41:15 +10:00
twangboy
d409a51bec Add missing state file for windows 2016-07-27 15:23:51 -07:00
twangboy
55cb909f68 Fix two more tests for Windows 2016-07-27 15:17:36 -07:00
Nicole Thomas
b089db6f21 Fix pylint of develop (#35002) 2016-07-27 15:18:29 -06:00
rallytime
35696ad637 Pylint fix 2016-07-27 15:12:41 -06:00
Mike Place
f9fd6ddd8a Fixup #33875 2016-07-27 13:25:59 -06:00
Eu
56b1f6c651 Fix naive fileserver map diff algorithm 
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.
 2016-07-27 13:24:19 -06:00
Mike Place
48aa151fa6 Fixup #33875 2016-07-27 13:17:57 -06:00
Mike Place
7956dbe568 Merge pull request #33875 from sangoma/correct_map_diff 
Fix naive fileserver map diff algorithm
 2016-07-27 13:14:49 -06:00
Mike Place
aae430d8c1 Merge pull request #34977 from terminalmage/zd868 
Add jid to return from runner/wheel funcs executed within orchestration
 2016-07-27 13:10:57 -06:00
Nicole Thomas
a5582d0535 Revert "Decode byte strings when running tests in Python 3" 2016-07-27 13:00:01 -06:00
twangboy
3da842cea3 Put import in the right place 2016-07-27 11:21:20 -07:00
twangboy
e74fd599ce Add missing import salt.utils.win_functions 2016-07-27 11:17:16 -07:00
Erik Johnson
c3f9e13fbe Update unit tests to reflect new behavior of WheelClient/RunnerClient 2016-07-27 13:01:24 -05:00
rallytime
a7d4f93697 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/integration/__init__.py
 2016-07-27 11:35:16 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout 
SSH timeout
 2016-07-27 11:24:37 -06:00
Mike Place
1067c17095 Merge pull request #34826 from rallytime/unit-module-py3-tests 
Python 3 compatibility fixes (execution module unit tests)
 2016-07-27 11:24:00 -06:00
Mike Place
5f8370ae8d Refine errors in client (#34976) 
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
 2016-07-27 11:05:31 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
rallytime
83d3ac4771 Decode byte strings when running tests in Python 3 2016-07-27 10:34:34 -06:00
Mike Place
28268208f9 Merge pull request #34937 from twangboy/int_tests_cp 
Fix test_list_minion for Windows
 2016-07-27 08:53:45 -06:00
Mike Place
847d8ea95f Merge pull request #34939 from twangboy/int_tests_git 
Fix git integration tests for Windows
 2016-07-27 08:44:35 -06:00
Mike Place
d1e808254e Merge pull request #34968 from rallytime/fix-34967 
Older versions of psutil may not have the 'children' attribute for processes
 2016-07-27 08:37:04 -06:00
Mike Place
2d3b95dec9 Merge pull request #34971 from cachedout/increase_timeout_grains_test 
Increase timeout for grains test
 2016-07-26 16:11:29 -06:00
Mike Place
82d271b43a Increase timeout for grains test 2016-07-26 16:10:30 -06:00
twangboy
47fb8379d7 Remove hosts and aliases from sub_minion conf 2016-07-26 16:07:55 -06:00
twangboy
d7800567f5 Fix hosts integration test 2016-07-26 16:00:07 -06:00
rallytime
28d28aa82e Older versions of psutil may not have the 'children' attribute for processes 
We also should make sure the 'children' variable is instantiated before calling it.

Fixes #34967
 2016-07-26 13:46:31 -06:00
Seth House
ca61237de7 Ensure 'data' remains a dictionary if conf file is empty or missing 2016-07-26 12:41:42 -06:00
Nicole Thomas
73d3b77a2c Merge pull request #34960 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-26 12:32:41 -06:00
Mike Place
55bb3d09ab Merge pull request #34919 from tonybaloney/libcloud_dns_states 
Add a new state module for managing DNS records and zones through Libcloud
 2016-07-26 11:51:08 -06:00
Johannes Scholz
775ea73578 fix unit tests 2016-07-26 19:46:14 +02:00
twangboy
d0a96181e6 Clarify lowercase checking 2016-07-26 10:39:54 -07:00
twangboy
3c0cf59565 Fix lint 2016-07-26 10:34:54 -07:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Anthony Shaw
6c08afd62b GCE Cloud tests (#34871) 
* add test module

* modify GCE tests to remove mocks

* use certifi, libcloud has also patched the SuSE/Mac cert issues

* skip cert checking

* validate the __virtual__ and import process

* fix munged merge

* fixed lint errors and failing test

* fix dimensiondata tests in the same way whilst I'm here
 2016-07-26 09:24:20 -06:00
Shane Lee
c4131c0afb Skip inode test in Windows (#34938) 2016-07-26 08:59:47 -06:00
twangboy
a5537ad6b9 Fix test_init, add lower 2016-07-25 16:11:36 -07:00
twangboy
e50ce384c0 Fix git integration tests for Windows 2016-07-25 15:45:11 -07:00
twangboy
0f74afc257 Fix test_list_minion for Windows 2016-07-25 14:49:32 -07:00
rallytime
8b295fe4ea Merge branch '2015.8' into '2016.3' 
Conflicts:
salt/config/__init__.py
salt/utils/parsers.py
tests/integration/__init__.py
 2016-07-25 14:13:44 -06:00
Anthony Shaw
ff60aec050 fix munged merge 2016-07-25 15:58:45 +10:00
Anthony Shaw
a3e37cc2d0 Merge branch 'develop' of github.com:saltstack/salt into develop 2016-07-24 20:08:47 +10:00
Anthony Shaw
8df4c35f5c
zone absent with tests 2016-07-24 19:48:11 +10:00
Anthony Shaw
3b5ddcb607
added zone_present state check 2016-07-24 19:45:06 +10:00
Anthony Shaw
4d7f3169f6
added zone_present state check 2016-07-24 19:43:06 +10:00
Anthony Shaw
fa04e2fcf5
use the correct dictionary structure for state changes 2016-07-24 19:30:32 +10:00
Anthony Shaw
fa5ac70183
add record absent logic and tests 2016-07-24 19:16:48 +10:00
Anthony Shaw
7f28b14958
fix tests 2016-07-24 19:06:34 +10:00
Anthony Shaw
51654e9b7a
add record name to mocks 2016-07-24 17:34:29 +10:00
Anthony Shaw
cb13bb6fba
add test with mocked execution module 2016-07-24 17:13:51 +10:00
Erik Johnson
92fffb06a7 Update unit test 
This unit test asserts based on the args with which a function was
called, and the args were changed which broke the test. This fixes the
test.
 2016-07-22 21:21:55 -05:00
Mike Place
baee2f2558 Config test no longer applies to new test config 2016-07-22 18:59:31 -06:00
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
twangboy
ff1fbce6ae Add check for admin on Windows, gated 2016-07-22 15:53:17 -07:00
Mike Place
1aee8b7dd4 Merge pull request #34906 from cachedout/set_run_salt_timeout 
Set timeout for run_salt in test suite
 2016-07-22 16:43:48 -06:00
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707 
Feature addition: preserve mode in file states
 2016-07-22 16:43:31 -06:00
Mike Place
38ac79d8bb Merge pull request #34829 from gtmanfred/py3 
[PY3] tests.unit.pillar
 2016-07-22 16:33:47 -06:00
Mike Place
5e0c63c0eb Merge pull request #34886 from eradman/cron 
Preserve trailing lines in crontab
 2016-07-22 16:25:23 -06:00
Mike Place
345e3e56b8 Merge pull request #34899 from rallytime/integration-cli-tests 
Fix integration/cli/*.py test failures when Running in Python 3
 2016-07-22 16:22:11 -06:00
Mike Place
cdfd0161fc Set timeout for run_salt in test suite 2016-07-22 16:14:25 -06:00
rallytime
56fb834718 Remove tests that don't test anything 2016-07-22 16:12:16 -06:00
Mike Place
ab84fd273e Merge pull request #34637 from cachedout/int_tests_interfaces 
Int tests interfaces
 2016-07-22 15:58:59 -06:00
rallytime
1031f19f3d Update batch integration tests to not be flaky in Python3 2016-07-22 14:19:15 -06:00
rallytime
109b368d19 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-22 10:32:59 -06:00
Eric Radman
b9be6521db Preserve trailing lines in crontab 
This allows cron.file to install a crontab file that contains trailing
newlines. Previously a change may have been detected on every run.
 2016-07-22 12:18:08 -04:00
Bo Maryniuk
87ffd6dc1e Regression fix: minion ID generator should use FQDN first, if available (#34876) 
* Regression fix: use FQDN first, if available

* Adjust the tests to the new behaviour (FQDN first)
 2016-07-22 09:21:42 -06:00
rallytime
74002ab9e7 Pylint fix 2016-07-22 09:13:33 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869) 
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
 2016-07-22 09:04:05 -06:00
Anthony Shaw
7e5cf2676b
fix munged merge 2016-07-22 14:31:52 +10:00
Anthony Shaw
7f31ccbf1e Merge branch 'develop' of github.com:saltstack/salt into develop 2016-07-22 13:19:34 +10:00
rallytime
9cc385cfcb Python3 doesn't have contextlib.nested 
The with statement supports the nested functionality by default.
 2016-07-21 15:38:00 -06:00
rallytime
2eea37739d Skip boto_elb unit tests for Py3 
These tests were written use the boto.ec2.elb class, which doesn't
exist in Python3. These tests need to be rewritten to run in Py3.
 2016-07-21 15:05:37 -06:00
rallytime
bd899bb6e1 Remove test that doesn't actually test anything 2016-07-21 14:33:02 -06:00
rallytime
8c30261580 Don't check for string encoding in Python 3 
Also fixed a failing zypper test
 2016-07-21 14:33:02 -06:00
rallytime
c2a2c2bb78 Use assertCountEqual instead of assertEqual for lists in Py3 2016-07-21 14:33:02 -06:00
rallytime
97cdaf003a Use assertCountEqual instead of assertItemsEqual for Python 3 2016-07-21 14:33:02 -06:00
rallytime
de6b2658d0 Remove test that isn't testing anything 2016-07-21 14:33:02 -06:00
rallytime
ad4f204cb2 readPlistFromString isn't included in plistlib for Python 3 
Use 'loads' instead.
 2016-07-21 14:33:02 -06:00
rallytime
f746fbf9cb Don't assert against lists in Python 3 - those are converted to views 2016-07-21 14:33:02 -06:00
rallytime
7cc438754d Use assertCountEqual in Python 3 to handle unsorted list returns 
Fixes the cassandra execution module unit tests
 2016-07-21 14:33:02 -06:00
Mike Place
b4be66dedf Fix wheel test 
Fix random ordering bug
 2016-07-21 13:54:32 -06:00
Mike Place
d85aca1f7a Merge branch 'develop' into int_tests_interfaces 2016-07-21 12:26:21 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
Erik Johnson
f9cd83e8bb Add integration test for mode=keep when source is a local path 2016-07-20 22:26:10 -05:00
Erik Johnson
1cd542edb8 Add integration test for mode=keep in file states 2016-07-20 22:08:16 -05:00
Daniel Wallace
d2341654ea [PY3] actually test with nodegroup_comp function 2016-07-20 17:06:35 -05:00
Daniel Wallace
1e3429a3a2 [PY3] skip mysql tests 
mysql-python is not compatible with python3 yet.
 2016-07-20 17:05:49 -05:00
twangboy
8f29723160 Fix duplicate import, circular reference 2016-07-20 14:34:58 -07:00
Erik Johnson
e9be937d8f Fix incorrectly-written test 
This was testing to confirm incorrect behavior. We should not be having
a leading zero when the setuid/setgid bit is set in the mode.
 2016-07-20 15:33:11 -05:00
rallytime
094731f4b6 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-20 12:32:08 -06:00
Mike Place
3342b0c664 Merge remote-tracking branch 'twangboy/int_tests_cachedout' into int_tests_interfaces 2016-07-20 10:25:42 -06:00
Mike Place
ec8a6ebab3 Correct config test errors 2016-07-20 10:00:31 -06:00
Mike Place
03039c13e2 Lint 2016-07-20 10:00:31 -06:00
Mike Place
5f5d7193b0 Add interface to all configs 
This got removed during the attempt to make the tests run on Windows.

I added them everywhere even though that's not strictly necessary.

Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
 2016-07-20 10:00:31 -06:00
twangboy
4e56d28993 Add tcp_master settings to both masters 2016-07-20 10:00:31 -06:00
twangboy
b5b0b9ae4b Add more info to --interactive report 2016-07-20 10:00:30 -06:00
twangboy
3833c008b2 Cleans up config parameters 2016-07-20 10:00:30 -06:00
twangboy
003e60f6c6 Add cachedir for minions and syndic 2016-07-20 10:00:30 -06:00
twangboy
81d7479dfb Remove backtick 2016-07-20 10:00:30 -06:00
twangboy
c1ae2537f1 Remove configuration from configs 2016-07-20 10:00:30 -06:00
twangboy
68e5620b92 Check actual minion ports 
For some reason this fixed the PYTHONPATH issue
 2016-07-20 10:00:30 -06:00
twangboy
55b8ea664e Remove redundant tcp_pull_port entry for minion 2016-07-20 10:00:30 -06:00
twangboy
79b5be6989 Add more descriptive report for interactive mode 2016-07-20 10:00:30 -06:00
twangboy
cfc82f4004 Fix lint 2016-07-20 10:00:30 -06:00
twangboy
54647eb7d8 Fix mem leak caused by pki_dir 2016-07-20 10:00:30 -06:00
twangboy
7f3f15378e Make additional changes to master configs 2016-07-20 10:00:30 -06:00
twangboy
a33c5c15da Fix master and sub_minion configs 2016-07-20 10:00:30 -06:00
twangboy
f55ba87bee Fix configs, remove default values 2016-07-20 10:00:30 -06:00
twangboy
9b14dc0a6e Add Pedro's suggestions 2016-07-20 10:00:30 -06:00
twangboy
9bc438e302 Fix subminion 2016-07-20 10:00:29 -06:00
twangboy
1805630fdc Fix integration tests on windows 2016-07-20 10:00:29 -06:00
twangboy
f7fb4985c4 Add Pedro's suggestions 2016-07-20 10:00:29 -06:00
twangboy
785f5470fc Fix subminion 2016-07-20 10:00:29 -06:00
twangboy
5bcb27e477 Fix integration tests on windows 2016-07-20 10:00:29 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -06:00
Mike Place
62ef8fdb35 Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse 
Add "osmajorrelease" grain (2016.3)
 2016-07-20 08:39:38 -06:00
Mike Place
aff29906fc Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel 
Add "osmajorrelease" grain
 2016-07-20 08:35:34 -06:00
Mike Place
b986c35a88 Merge pull request #34794 from rallytime/reneable-pam-test 
Renable the pam execution module unit test
 2016-07-20 08:05:50 -06:00
Mike Place
b7fe952427 Remove test for file dir behavior 
Refs #34809
 2016-07-20 08:04:00 -06:00
rallytime
d68b60bff8 Renable the pam execution module unit test 
The logic wasn't correct on the skipIF. We want these test to run
when sys.platform.startswith('OpenBSD') is False.
 2016-07-19 16:15:12 -06:00
Mike Place
8b3b2cfe69 Merge pull request #34268 from DSRCompany/features/23194_publisher_acl_globing 
Regex support in publisher ACL rules.
 2016-07-19 15:37:06 -06:00
Mike Place
3eb49d35cc Merge pull request #34786 from rallytime/iteritems-tests-dir 
Remove all object.iteritems() references from the tests/ directory
 2016-07-19 14:57:21 -06:00
twangboy
f960ded780 Gate SIGINT in shutdown routines for Windows 
SIGINT not available in Windows
 2016-07-19 13:48:03 -07:00
twangboy
c5245f6b24 Fix stack trace on Jenkins 2016-07-19 10:04:24 -07:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
rallytime
7b0ad25b09 Remove iteritems() references from unit/transport/*.py files 2016-07-19 10:22:33 -06:00
rallytime
0ad8183973 Remove iteritems() references from unit/modules/*.py 2016-07-19 10:18:26 -06:00
rallytime
c8930339d3 Remove iteritems() references from integration tests 2016-07-19 10:15:23 -06:00
Bo Maryniuk
038d2c3087 Fix group-add tests for SUSE 2016-07-19 18:01:37 +02:00
Bo Maryniuk
110a422d5a Keep osmajorrelease as a string type for 2016.3 release 2016-07-19 17:52:08 +02:00
rallytime
3e032dc397 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-19 09:30:45 -06:00
twangboy
b1014cdefb Add code to kill process in Windows 2016-07-18 13:01:44 -07:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751) 
Refs #34607
 2016-07-18 13:00:47 -06:00
Mike Place
46901c6e65 Disable test 
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
 2016-07-18 12:39:49 -06:00
rallytime
0baf92a972 Remove tests that were deleted in develop already 2016-07-18 11:14:21 -06:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
 2016-07-18 10:34:03 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
Dmitry Kuzmenko
27017e34ce Regex support in publisher ACL rules. 
Users in publisher ACL and users and functions in the publisher ACL
blacklist now have matched in the following order:
1. Equality
2. Glob
3. Regex

Users in publisher ACL still not supported in systems without pwd python
module (Windows, any else?)
 2016-07-18 19:15:28 +03:00
Bo Maryniuk
3cb6940904 Bugfix: access 'osmajorrelease' as an integer value 2016-07-18 17:14:57 +02:00
Mike Place
4625ee65b8 Remove unnedeed config test 
Refs #34607
 2016-07-18 09:12:18 -06:00
Mike Place
0452d0a0ec Lint 2016-07-18 06:45:57 -06:00
Nicole Thomas
2a3df50223 Merge pull request #34724 from rallytime/test-fix-34270 
Update mock value to match change in #34270.
 2016-07-16 14:06:04 -06:00
rallytime
f667b936e5 Update mock value to match change in #34270. 
Fixes the failing test in #34270
 2016-07-16 14:03:37 -06:00
Mike Place
1b3742c41b Merge pull request #34599 from meaksh/salt-snapper-module 
Snapper execution module and state for Salt
 2016-07-16 13:43:06 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
Mike Place
e918aba3c3 Merge pull request #34704 from babilen/influxdb-current 
Influxdb current
 2016-07-16 12:39:22 -06:00
Wolodja Wentland
87b54170aa Rename InfluxDB states and modules for 0.8 
InfluxDB versions newer than 0.8 introduced significant changes in
database concepts, user administration and Python API.

We therefore decided to rename the old InfluxDB states to 'influxdb08*'
and to reserve the 'influxdb' name for InfluxDB 0.9+ compatible states
and modules.
 2016-07-16 09:46:44 +02:00
Mike Place
b11fd8ef6a Merge pull request #34484 from dmacvicar/docker_images 
[WIP] Creating Docker images with pure Salt and running Salt commands inside containers
 2016-07-15 16:17:59 -06:00
Mike Place
99e638ab40 Merge pull request #34686 from rallytime/fix-doc-test 
CLI Example doc additions to fix the sysmod test failure
 2016-07-15 15:22:07 -06:00