valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
101,095 Commits 24 Branches 182 Tags 341 MiB
423f6f96b7
Commit Graph

175 Commits

Author SHA1 Message Date
Gareth J. Greenaway
dd2306921f
Adding tests for NACL changes. 2019-04-08 14:40:06 -07:00
Daniel A. Wozniak
ff76255017 Increase timeout on orchestrate subset test 2018-12-02 15:34:16 -07:00
Ch3LL
8501581f27
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/utils/mac_utils.py
  - salt/utils/win_runas.py
  - tests/support/case.py
 2018-11-14 12:38:16 -05:00
rallytime
2c51cf9816
Make target test job more specific to reduce test flakiness 2018-11-08 10:27:41 -05:00
rallytime
caace3f184
Rewrite job cache target test to be more robust 2018-11-07 17:01:06 -05:00
twangboy
0abb9e1842
Fix integration.runners.test_nacl on Windows Py3 
Fixes failing tests on Windows on Py3
nacl.py
- The keys have to be strings
- Removes redundant `to_bytes` code in the enc and dec functions
- Removes unnecessary if statement
test_nacl.py
- The compare data needs to be bytes
 2018-11-05 17:18:17 -07:00
twangboy
d968b7df0a
Adds timeouts to the manage.down runner 
Passes timeouts to the runner from the test
 2018-11-02 16:17:36 -06:00
rallytime
b29fcfabbb
New test must be py3 compatible...oops. :) 2018-10-31 12:52:58 -04:00
rallytime
6859e0e6e2
Add regression test for issue #48734 2018-10-31 12:03:14 -04:00
rallytime
9298304ce9
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-19 14:07:06 -04:00
rallytime
7ff24e5fb8
Mark orchestration test as expensive 2018-09-18 20:02:50 -04:00
rallytime
17d0a878fa
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/whitelist.txt
 2018-09-18 10:11:34 -04:00
Daniel A Wozniak
2340a5875f
Fix runner returns test on Windows 2018-09-15 15:14:40 -06:00
rallytime
bd5ec82921
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/runners/nacl.py
  - salt/tops/varstack_top.py
  - tests/unit/states/test_linux_acl.py
 2018-09-12 12:47:09 -04:00
Daniel A Wozniak
51500ac701
Adding passing windows nacl runner tests to whitelist 2018-09-11 16:43:00 -06:00
rallytime
937897b14c
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/states/file.py
  - salt/utils/vault.py
 2018-08-23 12:50:08 -04:00
Daniel Wallace
c927f1bc2b
mark orchestration state tests as flaky 2018-08-22 11:38:40 -05:00
Daniel Wallace
c48607c4af
mark orchestration state tests as flaky 2018-08-22 11:06:22 -05:00
Ch3LL
3a8fed5e57
Handle race condition when running mine.update in orch mine test 2018-08-15 13:16:26 -04:00
Ch3LL
b4e421c3d6
Add orch runner with mine.get integration tests 2018-08-15 13:16:26 -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
5ff1ddb0dd
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/files/conf/master
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/runners/test_state.py
  - tests/integration/scheduler/test_eval.py
 2018-08-10 14:18:34 -04:00
Gareth J. Greenaway
5d4e28825a
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-09 09:40:14 -07: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
b15cff1de6
Update old utils paths to use new paths 
Skip flaky test.
 2018-08-07 11:06:43 -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
6c8fb063ac
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-07-13 11:00:26 -04:00
rallytime
a04f8fc204
Update utils paths 2018-07-11 15:12:37 -04:00
rallytime
6f6c99b4ce
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/cron.py
  - salt/netapi/rest_tornado/saltnado.py
 2018-07-11 15:06:35 -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
rallytime
f23207002d
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/unit/beacons/test_btmp_beacon.py
  - tests/unit/beacons/test_wtmp_beacon.py
  - tests/unit/grains/test_core.py
 2018-06-15 17:00:59 -04: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
rallytime
d991430715
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-06-07 13:03:54 -04: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
Erik Johnson
a1ce0631fd
Use @property instead of @staticmethod for config_dir 
We're not passing arguments and we're just getting back a string
contstant, so there's no need to make this a staticmethod.
 2018-06-05 14:10:33 -05:00
rallytime
be8d34ec21
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-06-01 15:19:09 -04: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
Gareth J. Greenaway
257fca6447
Merge branch 'develop' into move_to_utils_nacl 2018-04-16 10:59:03 -07:00
rallytime
fe10957ce0
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-04-12 11:00:14 -04:00