Commit Graph

486 Commits

Author SHA1 Message Date
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon 2016-10-26 14:08:03 +09:00
Ch3LL
394fccf556 fix run_cloud timeout 2016-10-25 13:30:41 -06:00
Justin Findlay
1d503f032c tests.integration: pass opts as a dict 2016-10-20 14:16:35 -06:00
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09:00
Andrew Pashkin
337119c113 Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running 2016-10-12 13:21:40 -06:00
Mike Place
bd712bb0ff
Fix test suite hanging on shutdown 2016-10-05 17:14:27 +09:00
Mike Place
cdf2a56564
Fix issue where test suite could hang on shutdown
This is most common in the develop branch but could occur here as well.
2016-10-03 23:37:05 +09:00
Justin Findlay
74c518668b tests.integration.__init__: except psutil error
Related to d0f44c9.
2016-09-28 15:58:33 -06:00
Mike Place
487aae25b5 Lint 2016-09-20 12:50:39 -06:00
Mike Place
9d2eab47c1 Try/except psutil process access in OSX
Refs https://github.com/saltstack/qa/issues/244
2016-09-20 12:50:39 -06:00
Justin Anderson
b2a1779383 Close open socket on freebsd 2016-09-15 15:37:00 -06:00
Nicole Thomas
0e8e66877a Back-port #36067 to carbon (#36159)
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
2016-09-08 13:03:12 -06:00
Erik Johnson
d4059a0d79 Update the run_run_plus docstring 2016-09-03 14:59:04 -05:00
Erik Johnson
74d5f3aa51 Remove unused argument 2016-09-03 14:59:04 -05:00
Erik Johnson
a4e96cfb7a Don't execute the runner twice in run_run_plus
Instead, compile output by executing salt.output.display_output() on the
return data obtained from executing the runner via the Python API.
2016-09-03 14:59:04 -05:00
Erik Johnson
f41db032a2 Add ability to reload client_config to run_run_plus
This allows one to pass a kwarg to run_run_plus called
``__reload_config`` which will be passed as the ``from_scratch``
argument to self.get_config(). This allows self.run_run_plus() to force
a reload of the master config for integration tests which require the
config to be reloaded, for instance, from master.d/*.conf.
2016-09-03 14:59:04 -05:00
Erik Johnson
070e5f3c48 Fix typo, add return and jid to run_run_plus
Also make kwargs work (they were being ignored)
2016-09-03 14:59:03 -05:00
Pedro Algarvio
f842ddd525 OSX testsuite fixes (#35948)
* OSX is a bit more restrictive on getting the process information

* OSX says the sockets aren't connected, which is weird, but...

* Close the sockets on OSX
2016-08-31 13:09:51 -06:00
Mike Place
6bcd76bfce Catch shutdown error in test suite (#35933)
Change made per @s0undt3ch
2016-08-31 09:35:20 -06:00
Mike Place
e84cee89b8 Merge pull request #35937 from cachedout/increase_ssh_timeout_again
Increase SSH test timeout to 90s from 25s
2016-08-31 21:47:50 +09:00
Mike Place
becaa7d01f Fix colored output 2016-08-31 21:41:05 +09:00
Mike Place
0b38c75a28 Increase SSH test timeout to 90s from 25s 2016-08-31 21:34:38 +09:00
Mike Place
ed2ef93107 Enable debug logs for ssh tests
This might be only temporary but we need to see why some tests are flakey.
2016-08-31 20:42:27 +09:00
Pedro Algarvio
9cdda5377a
Use the terminate_process_pid helper function 2016-08-23 18:36:27 +01:00
Pedro Algarvio
33a6e75142
Log the cmdline instead. Better nuke approach. 2016-08-22 00:36:47 +01:00
Mike Place
520019f9a4 Provide a cleaner error for older versions of salt-testing for runTest() 2016-08-20 22:22:52 +09: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
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
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
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
c69643d4ef Fix error in passing timeout for salt tests 2016-08-03 07:30:09 +09: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
e058be0c3b Fix typo 2016-08-02 01:45:48 -06:00
Dmitry Kuzmenko
b412e7814a Fixed salt-run integration tests. 2016-08-02 10:01:01 +03:00
Mike Place
b5e556f3a3 Sync before state tests 2016-08-01 18:26:18 -06:00
Mike Place
9adfa4a651 Merge pull request #34972 from twangboy/int_tests_hosts
Fix hosts integration tests for Windows
2016-07-28 13:36:11 -06:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/utils/schedule.py
2016-07-28 11:08:14 -06:00
Nicole Thomas
a5582d0535 Revert "Decode byte strings when running tests in Python 3" 2016-07-27 13:00:01 -06:00
rallytime
a7d4f93697 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/integration/__init__.py
2016-07-27 11:35:16 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
rallytime
83d3ac4771 Decode byte strings when running tests in Python 3 2016-07-27 10:34:34 -06:00
Mike Place
d1e808254e Merge pull request #34968 from rallytime/fix-34967
Older versions of psutil may not have the 'children' attribute for processes
2016-07-27 08:37:04 -06:00
twangboy
d7800567f5 Fix hosts integration test 2016-07-26 16:00:07 -06:00
rallytime
28d28aa82e Older versions of psutil may not have the 'children' attribute for processes
We also should make sure the 'children' variable is instantiated before calling it.

Fixes #34967
2016-07-26 13:46:31 -06:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
2016-07-26 11:05:24 -06:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00