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
94,056 Commits 24 Branches 182 Tags 341 MiB
0191af1423
Commit Graph

137 Commits

Author SHA1 Message Date
Daniel Wallace
720b671dda
mark orchestration state tests as flaky 2018-08-30 10:18:12 -04:00
Gareth J. Greenaway
8108a4d31a
Adding some tests for the grains, pillar and mine functions in the cache runner. These will also ensure that the relevant functions in salt.utils.master.MasterPillarUtil are functioning properly. 2018-08-13 10:47:47 -04:00
rallytime
c26fa0d6c4
Mark orchestration test as expensive 2018-08-08 13:38:09 -04:00
rallytime
3e6445a9d6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/beacons/log.py
  - salt/client/ssh/__init__.py
  - salt/modules/cmdmod.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
 2018-08-08 13:31:57 -04:00
rallytime
668da57ab9
Mark some shell and runner integration tests as flaky 
In addition to marking these tests as flaky, the commit also updates
the affected tests to use pytest notation instead of unittest notation.
 2018-08-05 16:19:29 -04:00
rallytime
d3190ca0c0
Update old utils paths to new utils paths 2018-07-11 14:52:54 -04:00
rallytime
29b05ffdd1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - pkg/windows/req.txt
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_npm.py
 2018-07-11 14:49:27 -04:00
Gareth J. Greenaway
4b492fa633
Removing unused start_time variable from test_orchestration_with_pillar_dot_items test. 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
30c5855d20
Fixing a few things in the new test. 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
36b7253418
Fixing lint issue 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
ab6abfad31
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner. 2018-07-02 11:55:46 -07:00
Gareth J. Greenaway
6f11da35a7
Fixing a few things in the new test. 2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
cf747b14ec
Fixing lint issue 2018-07-02 11:20:35 -07:00
Gareth J. Greenaway
16d36c79c8
When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner. 2018-07-02 11:20:35 -07:00
Daniel Wallace
d8c035e5e5
mark test as expensive 
This tests takes a large amount of cpu to run, and is causing tests to
hang.

Mark it as an expensive test so it only runs with the cloud tests.
 2018-06-11 16:08:10 -05:00
Gareth J. Greenaway
4377e0cc08
Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. 2018-06-06 13:52:45 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7. 2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
3e074be9c3
Fixing lint 2018-05-28 09:36:46 -07:00
Gareth J. Greenaway
377e34c689
Updating function in saltmod to ensure that the result is a failure if the function being run returns as False. 2018-05-28 09:36:45 -07:00
rallytime
34a478dfe5
Update old fopen path with new utils files path 2018-04-11 12:44:04 -04:00
rallytime
590c7fc13f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/files.py
  - tests/integration/modules/test_pip.py
 2018-04-11 12:41:22 -04:00
Nicole Thomas
a34b92ae82
Merge pull request #46339 from DSRCorporation/bugs/ssh_state_test_failures 
SSH State test failures
 2018-04-10 13:06:50 -04:00
Matt Phillips
a9866c7a03 fix parallel mode py3 compatibility 
parallel: True codepath incompatibilities uncovered by the added tests.
additionally use salt.serializers.msgpack to avoid other py2/py3/back compat
issues.
 2018-04-05 22:30:59 -04:00
rallytime
0a297e7319
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/grains/core.py
  - salt/utils/__init__.py
 2018-04-05 13:43:51 -04:00
Matt Phillips
6d7730864a removing prereq from test orch 
seems to be encountering unrelated preexisting failures in the functionality
unrelated to my changes.
 2018-04-05 11:45:25 -04:00
Matt Phillips
6c8a25778f add integration test to runners/test_state to exercise parallel 
this should hopefully exercise a few different facets of parallel that were
previously not covered in the code base.
 2018-04-05 11:45:25 -04:00
Daniel Wallace
637cdc6b7b
fix pylint 2018-04-04 14:37:04 -05:00
Daniel Wallace
4a3ed6607d
add test for subset in orchestration 2018-04-03 15:13:00 -05:00
Dmitry Kuzmenko
6fdc458a7f
Increase timeout for run_run in ShellCase 2018-03-29 22:46:23 +03:00
Nicole Thomas
c67afbeb36
Merge pull request #46650 from Ch3LL/nacl_test 
Mirror libnacl imports in test from the nacl module
 2018-03-26 10:48:39 -04:00
Ch3LL
9fef8bc431
Mirror libnacl imports in test from the nacl runner 2018-03-21 15:18:58 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
Gareth J. Greenaway
ab02ffd4ae
Swapping out import-error for unused-import. 2018-03-09 07:13:27 -08:00
Gareth J. Greenaway
e6c9740a7d
Gating nacl tests to ensure libnacl is installed. 2018-03-08 10:06:58 -08:00
Gareth J. Greenaway
4ae2861d68
Fixing a few bugs introducted following the move to unicode all the things. Adding deprecation notices for the previously used key and key_file arguments. Adding deprecation into Release notes. Adding some tests for Naccl module and runner to test encryption and decryption. 2018-03-08 10:06:55 -08:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00
Daniel Wallace
53d969a152
mark orch test as flaky 2018-02-21 09:41:57 -07:00
Erik Johnson
458fdc326c
Increase timeout for orchestration test 
This orch test takes longer on some test VM images than others.
 2018-01-23 19:34:23 -06:00
Daniel Wallace
cf98ed472e
fix up symlinks 2018-01-04 17:29:45 -05:00
Nicole Thomas
0658e0f664
Merge pull request #45190 from terminalmage/yaml 
Replace yaml usage with a helper to ensure unicode is handled properly
 2018-01-04 09:04:02 -05:00
Daniel Wallace
19198fd866
fix up symlinks 2018-01-03 15:08:42 -07:00
Erik Johnson
002aa88a97
Replace yaml usage with a helper to ensure unicode is handled properly 
Without allow_unicode=True, unicode characters are processed through the
str representer and on Python 2 are dumped as a Unicode code point (i.e.
a literal \u0414). This commit makes allow_unicode=True the default in
our salt.utils.yamlloader.safe_dump() helper. It also adds a new
salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also
makes allow_unicode=True the default.

To make importing and using our custom yaml loader/dumper easier, a
convenience module called salt.utils.yaml has been added, which does a
wildcard import from both salt.utils.yamldumper and
salt.utils.yamlloader.

Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to
salt.utils.yaml, to ensure that unicode is handled properly.
 2018-01-03 14:14:21 -06:00
Erik Johnson
7b13a7df8b
Replace json module usage with a helper to ensure unicode content is handled properly 
This adds wrappers for json.dump{,s} which disable `ensure_ascii` by
default.
 2017-12-27 09:30:58 -06:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/modules/win_lgpo.py
  - salt/returners/mysql.py
  - salt/states/libcloud_dns.py
  - tests/integration/runners/test_runner_returns.py
  - tests/unit/grains/test_core.py
 2017-12-21 15:58:08 -05:00
Daniel Wallace
23bd38ad66
enable using kitchen-salt on ec2 
These changes are needed to run the test suite on ec2 using sudo.
 2017-12-20 17:18:39 -07:00
Erik Johnson
5adf852615
Add unicode_literals to runner modules 2017-12-14 19:30:14 -06:00
Erik Johnson
ee3486a671
Include failed state/function orchestration results in changes dict 
Before this commit they would be in the comment, making it difficult to
programatically analyze the failures.
 2017-12-05 00:56:05 -06:00
Erik Johnson
18905cf32b
Add integration test for triggering orchestration failure via context 2017-11-28 22:03:11 -06:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop' 
Conflicts:
  - .kitchen.yml
  - tests/unit/test_doc.py
  - tests/unit/utils/test_cloud.py
 2017-11-13 12:27:59 -05:00
Ch3LL
f3ec6df76e
Add orchestration tests when target exists or not 2017-11-10 12:00:12 -05:00