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
91,935 Commits 24 Branches 182 Tags 341 MiB
082b8d0b3d
Commit Graph

1483 Commits

Author SHA1 Message Date
Daniel A. Wozniak
082b8d0b3d
Use salt.utils.platform 2018-04-25 08:36:32 -07:00
Daniel A. Wozniak
cc2538e08f
The grp modules is not available on windows 2018-04-25 00:23:20 -07:00
Daniel A. Wozniak
7d045eb235
Fix decorator wart 2018-04-24 19:09:08 -07:00
Daniel Wozniak
f591cff643
Merge pull request #47290 from dwoz/test_cp_fix 
Run cache_master test in tmp dir
 2018-04-24 16:37:20 -07:00
Daniel A. Wozniak
5ff51affbd
Run cache_master test in tmp dir 2018-04-24 14:58:20 -07:00
rallytime
120c5446b7
Update old utils paths to new utils paths 2018-04-19 17:25:55 -04:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
Nicole Thomas
1947ffdf56
Merge pull request #47122 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-04-19 16:44:17 -04:00
Ch3LL
25a84428b8
Add status module integration modules tests for Windows 2018-04-19 12:01:40 -04:00
Erik Johnson
879c557264
Use decorators for temp files/dirs in test suite 
This adds a new decorator which creates a temporary directory and cleans
it after the test completes. It also modifies an existing decorator for
creating temporary files so that it accepts arguments, which will be
passed through to salt.utils.files.mkstemp().
 2018-04-18 19:46:29 -05:00
Ch3LL
e7c9bc4038
Add user integration tests for windows OS 2018-04-17 16:45:41 -04:00
rallytime
3416e398c6
Update old utils paths references to use new paths 2018-04-17 11:02:38 -04:00
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/test_minion.py
 2018-04-17 10:54:42 -04:00
Daniel A. Wozniak
444da3f893
Fix py3 wart (chr vs bytesstring) 2018-04-14 17:39:29 -07:00
Daniel A Wozniak
e8acca01c2
Fix failing state test by normalizing line endings 
Fixes:

integration.modules.test_state.StateModuleTest.test_issue_1896_file_append_source
 2018-04-14 15:45:11 -07: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
Daniel Wallace
791af8f6ce
switch pip test package 
Using irc3-plugins-test, since this should never be updated (i manage it and it
is fulfilling its only job).
 2018-04-10 14:09:20 -05:00
Gareth J. Greenaway
0891c6b580
fixing docstring 2018-04-06 13:19:10 -07:00
Gareth J. Greenaway
c8945e4b2e
cleaning up some imports. 2018-04-06 13:19:10 -07:00
Gareth J. Greenaway
0599759e5b
cleaning up some test doc strings. 2018-04-06 13:19:10 -07:00
Gareth J. Greenaway
dceda5eb88
Moving all jinja filter tests into support/jinja_filters.py. Updaitng integration/ssh/test_jinja_filters.py to use those tests. Adding integration/modules/test_state_jinja_filters.py to also use the common jinja filter tests. 2018-04-06 13:19:10 -07: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
Mike Place
4e5e291c99
Merge pull request #46873 from terminalmage/utf8-first 
Attempt UTF-8 first when decoding/encoding
 2018-04-05 09:16:27 -05:00
Nicole Thomas
f70f6de282
Merge pull request #46647 from twangboy/win_fix_test_grains 
Fix the tear down function in integration.modules.test_grains
 2018-04-04 17:14:05 -04:00
Erik Johnson
f59cee28db
Remove hacky workarounds to get encode/decode tests to pass on Windows 2018-04-04 13:18:04 -05:00
rallytime
a0fcd5c053
Fix test_cp failure: forgot to add tgt to test when @with_tempfile is present 2018-04-04 11:43:03 -04:00
rallytime
d0202cab72
Resolve bad merge: there should only be one test_get_file_from_env_in_url test 2018-04-03 16:19:12 -04:00
Gareth J. Greenaway
13875e78cf
Fixing documention string for test. 2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
3d288c44d4
Fixing test documentation 2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
6cff02ef6a
Adding tests for #46788 2018-04-03 12:37:49 -07:00
rallytime
4ad50bbdee
Update old utils paths to new paths 2018-04-03 14:46:56 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/conf.py
  - salt/loader.py
  - salt/modules/dockermod.py
  - salt/modules/sensehat.py
  - salt/utils/parsers.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/spm/test_man_spm.py
  - tests/integration/states/test_npm.py
  - tests/unit/states/test_environ.py
 2018-04-03 14:33:11 -04:00
rallytime
209a8029c3
Fix the new test failures from the mantest changes 
The changes in #46778 introduced a couple of test failures into the 2017.7 branch.

This PR cleans up some of the references causing failures on 3 new test failures.
The failures are due to the new reference of the `mantest` module, which is only
used for testing here, and not an actual module in salt to test docs and the
saltutil module against.
 2018-04-02 16:06:50 -04:00
Erik Johnson
f8f9d045ac
Add regression test 2018-03-30 13:12:02 -05:00
Mike Place
e533b7182d
Merge pull request #46766 from twangboy/win_fix_test_git 
Change the way we're cleaning up after some tests
 2018-03-30 12:01:02 -06:00
twangboy
5afc66452c
Remove unused/redundant imports 2018-03-28 12:30:26 -06:00
twangboy
88fd72c52c
Use with_tempfile decorator where possible 2018-03-28 11:38:32 -06:00
rallytime
e312efb5e7
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/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04: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
Gareth J. Greenaway
e721168dc4
removing salt.utils.stringutils.to_unicode from output/highstate.py and adding encoding=utf-8 to events payloads. 2018-03-23 19:09:20 -07:00
Ch3LL
7cda825e90
Add groupadd module integration tests for Windows 2018-03-23 13:30:22 -04:00
Ch3LL
f11d58a8e9
Mirror libnacl imports in test from the nacl module 2018-03-21 15:10:46 -04:00
twangboy
c179388b0e
Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase 
Fix the tear down function to just set the grain to an empty list instead of
removing each individual item
 2018-03-21 16:37:10 +00:00
Nicole Thomas
83ed40c06a
Merge pull request #46619 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.5 to 2017.7
 2018-03-20 15:03:29 -04:00
Gareth J. Greenaway
152c43c843
Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. 2018-03-15 17:45:42 -07: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
Erik Johnson
010d260d06
Rewrite failing Suse pkg integration test 
This makes the test less brittle by hard-coding which package to use
 2018-03-14 23:35:25 -05:00
rallytime
aa760334a1
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-13 10:58:28 -04:00
Nicole Thomas
22d753364b
Merge pull request #46337 from gtmanfred/2017.7 
Fix using names with listen and listen_in
 2018-03-12 14:49:59 -04:00