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,667 Commits 24 Branches 182 Tags 341 MiB
bd2c05b988
Commit Graph

2896 Commits

Author SHA1 Message Date
twangboy
bd2c05b988 Fix skipped windows tests 2016-08-17 10:41:46 -06:00
Erik Johnson
235c9f5fe2 Close file descriptor for temp file 2016-08-17 10:37:46 -06:00
twangboy
4fc64e9e7a Add missing skipIf import 2016-08-17 10:37:46 -06:00
twangboy
ff96a88374 Fix/Skip tests 2016-08-17 10:37:46 -06:00
rallytime
49179ac401 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/integration/files/conf/master
 2016-08-16 12:52:20 -06:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
 2016-08-16 11:02:05 -06:00
Mihai Dinca
b0f0b4effc Make sha256 the default hash_type 2016-08-15 10:02:19 +02:00
rallytime
a3a5496d0f Fix some items that went awry in the merge 2016-08-12 17:06:27 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
Mike Place
fc0d5878bc Set file_recv on test master 2016-08-12 19:08:27 +09:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
 2016-08-11 11:33:54 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359) 
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
 2016-08-11 10:45:24 -06:00
rallytime
a651962e95 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-10 10:02:03 -06:00
Erik Johnson
243909f39d file.recurse: Do not convert octal mode string to int (#35309) 
* Add integration test for #34945

* file.recurse: Do not convert octal mode string to int

When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.

Fixes #34945.
 2016-08-09 13:02:26 -06:00
Mike Place
a3e29c8274 Final check for running procs (#35292) 
* Final check for running procs

This does a final check to kill any running procs that are lingering.

* Lint
 2016-08-09 08:48:06 -06:00
Mike Place
15d088c15f Avoid str to bytes join in test util (#35295) 
Fixes some shell.call tests.
 2016-08-09 08:47:34 -06:00
Mike Place
7310921f81 Merge pull request #35277 from plastikos/bug-testprogram_env_pythpath 
Joining sys.path is redundant and causes the string result to be split and re-joined.
 2016-08-09 09:10:11 +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
Thayne Harbaugh
5fb3f025e4 Joining sys.path is redundant and causes the string result to be split and re-joined. 2016-08-08 11:31:17 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
 2016-08-08 11:15:43 -06:00
Jeff
abb72e478f Revert b00b3c4 (but keep addition to allow_failure list in test_valid_docs()) 2016-08-06 20:10:06 +08:00
Mike Place
74f7fc0fc0 Merge pull request #35186 from terminalmage/py3-tests-integration-loader 
Make integration.loader tests PY3-compatible
 2016-08-06 17:42:41 +09:00
Erik Johnson
e2e8bbbfde Add integration test for #35214 2016-08-05 20:47:24 -05: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
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
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
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
Mike Place
2b7b4eb4ca Fix wheel test 
This aligns with the new test layout
 2016-08-03 03:53:15 +09:00
Mike Place
324fdd121f Remoe py3 fix/shell/salt.utils.event 2016-08-03 03:38:35 +09:00
Mike Place
4df8b32509 More liberal matching for batch tests 
Fixes test failures currently in develop
 2016-08-03 03:32:03 +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
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
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
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
8ab96d9b50 Remove integration tests for sys.list_{functions,modules} 2016-08-02 12:09:56 +08:00