Commit Graph

2931 Commits

Author SHA1 Message Date
Mike Place
034a353689 Use skipIf properly 2016-08-22 16:11:01 +09:00
Mike Place
844a7577db Remove disabled decorator 2016-08-22 16:04:13 +09:00
Mike Place
092aa89777 Add final args to disable event printing for wheel 2016-08-22 14:51:47 +09:00
Mike Place
2992bb8abc Fix args err in wheel test 2016-08-22 13:31:23 +09:00
Mike Place
b4f71e0260 Support the supression of prints in the wheel module
This will clean up all those pesky key output issues in the wheel tests.
2016-08-22 13:11:38 +09:00
Mike Place
7f137835b9 Merge pull request #35626 from cachedout/better_cleanup_for2731
Wrap the test in a try/finally to ensure that the keys get cleaned up.
2016-08-22 12:38:17 +09:00
Mike Place
9248ce07f9 Lint 2016-08-22 12:33:24 +09:00
Mike Place
00a419fdf7 Merge pull request #35629 from cachedout/loosen_wheel_test
Just check for keys, not compare all keys for wheel netapi test
2016-08-22 12:32:11 +09:00
Mike Place
b09fd9c741 Merge pull request #35632 from s0undt3ch/develop
Fix hang on test suite termination
2016-08-22 12:31:08 +09:00
Mike Place
7e8721b4c2 Fix wheel test to call correct wheel function
This was not causing a test failure because no asserts were being
made but it was throwing exceptions silently. This cleans that up.
2016-08-22 11:44:50 +09:00
Pedro Algarvio
f7693f306c
Apply child processes cleanup counter measure on testprogram too.
Additionally, avoid timeout exceptions with registered atexit calls for testprogram(s)
2016-08-22 00:36:53 +01:00
Pedro Algarvio
33a6e75142
Log the cmdline instead. Better nuke approach. 2016-08-22 00:36:47 +01:00
Mike Place
a85ab3e59c Just check for keys, not compare all keys for wheel netapi test 2016-08-21 22:17:27 +09:00
Mike Place
ea8fb37b48 Wrap the test in a try/finally to ensure that the keys get cleaned up.
We're seeing the keys appear later on in some tests, such as here:

integration.modules.saltutil.SaltUtilModuleTest.test_wheel_just_function
2016-08-21 20:22:26 +09:00
Mike Place
c4ea3cd073 Fix cache test on develop 2016-08-21 13:35:27 +09:00
Mike Place
520019f9a4 Provide a cleaner error for older versions of salt-testing for runTest() 2016-08-20 22:22:52 +09:00
Mike Place
8e784c6e80 Merge pull request #35554 from cachedout/git_test_py3
Fix git module test for py3
2016-08-20 22:17:13 +09:00
Mike Place
b282d877e6 Merge pull request #35482 from raazvvann/dev/rheghedu/system-comments
Add linux support for {get,set}_computer_desc CONTINUED
2016-08-20 11:44:25 +09:00
Mike Place
e7405258d4 Merge pull request #35499 from cro/returner_self_destruct
Returner self destruct
2016-08-20 11:42:03 +09:00
Mike Place
b9673b8b35 Str subst 2016-08-20 10:58:45 +09:00
Mike Place
37075ca229 Merge pull request #35557 from 10ne1/dev/ionel/fix-integration-test-tmpdir-cleanup
tests/integration: wait for test children to terminate
2016-08-20 10:57:22 +09:00
jmacfar
bd70a12ec6 Pass makedirs through to fileclient
Integration tests for get_url makedirs=True
2016-08-19 12:18:05 -05:00
Mike Place
38630455ec Don't open files in text files in binary mode in pip test (#35553)
Python 3 is picky about this sort of thing
2016-08-18 09:41:19 -06:00
Heghedus Razvan
46696794ab Add integration test for {get/set}_computer_desc
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-08-18 17:03:26 +03:00
Ioan-Adrian Ratiu
0561aaf139 tests/integration: wait for test children to terminate
This is a fix for salt github issue #35028.

Commit b02926f41c ("Immediate shutdown") removed the join() call
when stopping the daemon process, thus triggering a race between the
tmpdir cleanup logic and running children who still have data to
write. By re-adding the join() call we ensure all children finish
before the tmpdir gets removed. Children should normally be dead when
the call from join() returns, the SIGKILL logic after join() is for
cleaning up hanged processes.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
2016-08-18 14:43:50 +03:00
Mike Place
ca045f4feb Fix git module test for py3
Simple binary compat fixes in version compare
2016-08-18 19:56:00 +09:00
Mike Place
9279d6b6eb Merge pull request #35496 from StackPointCloud/profitbricks-cloud-improvements
ProfitBricks cloud provider features and improvements
2016-08-18 09:39:02 +09:00
rallytime
d2340a0aad Merge branch '2016.3' into 'develop'
Conflicts:
  - pkg/windows/build.bat
  - pkg/windows/build_pkg.bat
  - tests/runtests.py
2016-08-17 12:13:26 -06:00
rallytime
c305d8d99b Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/conf.py
  - tests/runtests.py
2016-08-17 10:37:57 -06:00
Mike Place
9f87081cef Merge pull request #35302 from Ch3LL/add_job_cache_test
Add job cache test
2016-08-17 19:45:28 +09:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
C. R. Oldham
f10ac3d126 Archiver is no longer a runner 2016-08-16 14:37:02 -06:00
Ethan Devenport
de42b0135c Added new features and improvements to the ProfitBricks provider including:
* Refactored LAN and NIC provisioning to use a more efficient composite server request.
* Added support for new INTEL_XEON and AMD_OPTERON CPU family types.
* Allow additional data volumes can be created and attached to servers.
* Added public and private network firewall rules.
* Added preliminary support for loadbalancers CLI functions.
* Corrected ProfitBricks name topic index.
* Updated ProfitBricks provider documentation.
* Updated provider integration test configs.
* PEP8 clean up.
2016-08-16 20:07:42 +00: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
C. R. Oldham
32fb152ef7 Test improvement. 2016-08-16 10:33:26 -06:00
C. R. Oldham
9ff22fd4f1 WIP MySQL returner archiver 2016-08-16 10:33:26 -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
Ch3LL
7316df7a02 fix pylint 2016-08-09 10:35:01 -06:00
Ch3LL
50a4f0fe6a fix comment 2016-08-09 09:26:51 -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