Commit Graph

3296 Commits

Author SHA1 Message Date
Mike Place
b158bb6557
Fix gem test (develop) 2016-11-30 10:56:41 -07:00
Ch3LL
8c9e9de335 change name 2016-11-30 10:27:37 -07:00
Ch3LL
1d52c18316 add init_delay option for service.dead state module 2016-11-30 10:22:05 -07:00
Mike Place
1d221aa91c
Update gem test for 2016.11 2016-11-30 09:44:56 -07:00
rallytime
ac8524fb91 [Nitrogen Deprecation] Remove SaltAPI.run() function
Also remove reference to SaltAPI.run() call and move to SaltAPI.start()
call instead in integration/__init__.py
2016-11-29 14:18:40 -07:00
Mike Place
894cca3427
Update test for new gem ver 2016-11-28 11:17:07 -07:00
Pedro Algarvio
cbcd4ce123
Make terminate_process_pid match latest form salt-testing.
Namely https://github.com/saltstack/salt-testing/commit/094d00784812
2016-11-24 13:19:56 +00:00
rallytime
6479a22c1d Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/napalm_network.py
2016-11-18 07:50:16 -07:00
rallytime
d5a7ef6ca8 Merge branch '2016.3' into '2016.11'
No conflicts.
2016-11-17 10:37:42 -07:00
Ch3LL
9ef41dcdfc change size and image of joyent profile 2016-11-16 11:54:21 -07:00
rallytime
1aa463b4c1 Merge branch '2016.3' into '2016.11'
No conflicts.
2016-11-16 09:27:06 -07:00
Mike Place
f3496297a6 Don't check archive if the archive can't be found (#37723)
Fixes possible false postive failure in archive test
2016-11-16 09:23:39 -07:00
rallytime
5f4a73f880 Merge branch '2016.11' into 'develop'
No conflicts.
2016-11-16 08:55:22 -07:00
Ch3LL
363122c675 add timeout increase on azure tests 2016-11-15 10:27:44 -07:00
twangboy
a0429cf839 Use nfsd instead of apsd for test_disabled 2016-11-15 09:44:42 -07:00
twangboy
053198aa45 Fix tab 2016-11-15 09:33:01 -07:00
Jenkins
384cf67de5 Use nfsd instead of apsd to test disabled 2016-11-15 09:25:28 -07:00
Mike Place
9738b6359f Merge pull request #37671 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2016-11-15 20:01:09 +13:00
Mike Place
bc65697502
Require network for npm tests 2016-11-15 12:45:17 +13:00
Ch3LL
acd4c3061e fix import for virtualbox test 2016-11-14 14:48:37 -07:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
2016-11-14 09:19:49 -07:00
rallytime
0e332ab591 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cli/batch.py
  - salt/cli/salt.py
  - salt/transport/client.py
  - salt/utils/vmware.py
  - tests/integration/modules/sysmod.py
2016-11-14 09:14:00 -07:00
Mike Place
305e51d1c0 Merge pull request #37625 from cachedout/issue_37492
Return with proper retcodes in batch mode
2016-11-12 20:29:09 +00:00
Mike Place
b14faf1c68 Merge pull request #37611 from jeanpralo/fix-cmd-batch-raw
Fix cmd batch raw
2016-11-11 15:53:58 +13:00
Mike Place
4fab707bdd Merge pull request #37627 from cachedout/pr-36706
Exempt pip.iteritems from test_valid_docs test
2016-11-11 15:48:37 +13:00
Mike Place
94df2f8e6f
Exempt pip.iteritems from test_valid_docs test 2016-11-11 15:47:43 +13:00
Jean Praloran
4f16840ef1 add integration test for salt.client.LocalClient.cmd_batch 2016-11-11 14:20:51 +13:00
Mike Place
b6031524e5
Return with proper retcodes in batch mode
Check for the highest retcode received in batch mode and exit with it.

Also, an integration test for the same.

Closes #37492
2016-11-11 14:03:29 +13:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/x509.py
2016-11-10 16:51:52 -07:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
2016-11-10 15:59:51 -07:00
Eric Radman
671cebfa30 Skip random.org tests for any communication failure
This test connects to random.org, which may throws the following error
on one network I manage:

ssl.SSLError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:590)

Other errors are possible, such as `socket.error`.  Since it is
difficult to anticipate the failure mode, skip these tests if https
communication provokes any exception.

Also, this is not a unit test--it's more of a system test. My
recommendation that we recategorize this as an integration test where
global IPv4 routing can more reasonably expected.
2016-11-10 07:48:24 -05:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00
msiebeneicher
5428ed5d8c Merge branch 'develop' of https://github.com/saltstack/salt into improvement/fix_log_output_for_json_and_yaml
* 'develop' of https://github.com/saltstack/salt: (72 commits)
  Remove known issues section for rc2 (#37569)
  Update release candidate docs with RC2 info (#37564)
  sqlite is not found in 2015.8 (#37549)
  Use 'driver' instead of 'provider' in test cloud configs (#37547)
  Added pillar_enc variable to orchestrate to be passed through
  Lint
  Cache tests
  Add unit tests for minion targeting
  Slight grammar fix
  Pylint fixes
  refresh_pillar() should be called always
  Improvements and bug fixes: - Ensure all keys in nested dicts under the data payload have dots replaced with underscores and store original key for reference - Replace use of config.option execution module which does not support ":" path syntax with salt.returners.get_returner_options() so config options are actually obtained - Fixed use of datetime module in date_index mode so functions are loaded properly
  Pylint fix for develop (#37513)
  Saltstack PPA is no longer maintained
  allow selection by id
  Update vmware.py
  handle other Solaris-like distributions that use pkgsrc the same as SmartOS
  Fix some lint
  Clean up docs
  Fix some syntax errors, string type checks
  ...
2016-11-09 11:53:34 +01:00
Nicole Thomas
2e8e56ca69 [PY3] Change log.warn statements to log.warning (#37531)
* [PY3] Change log.warn statements to log.warning

log.warn is deprecated in Python 3. This change removes the
occurance of deprecation warnings for using log.warn. For example:

```
17:24:23 [WARNING ] /testing/salt/utils/verify.py:522: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead
17:24:23   log.warn('Insecure logging configuration detected! Sensitive data may be logged.')
17:24:23
17:24:23 [WARNING ] Insecure logging configuration detected! Sensitive data may be logged.
```

* Tweak unit.utils.verify_test to using warning instead of warn
2016-11-08 13:06:54 -07:00
Eric Radman
4cd92980d8 Use 'driver' instead of 'provider' in test cloud configs (#37547)
Running the tests currently provokes a warning from
salt/config/__init__.py:│2275 ("'provider' will be
deprecated in the Nitrogen release")
2016-11-08 09:50:39 -07:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon'
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
2016-11-04 15:23:49 -06:00
msiebeneicher
1169cc3a11 reverted json log changes part2 2016-11-04 11:16:08 +01:00
msiebeneicher
9a1a23fca5 reverted json log changes 2016-11-04 11:09:45 +01:00
msiebeneicher
a742575b19 reintegrate develop branch 2016-11-04 11:07:17 +01:00
Mike Place
580eca709b Merge pull request #37121 from nevins-b/2016.3
allow the file.recurse state to support saltenv
2016-11-04 18:59:28 +13:00
Ethan Devenport
21e24a8125 Cloud API v3 updates including:
* Added server availability zone parameter.
* Added volume availability zone parameters.
* Added NAT parameter for private NIC.
* Updated documentation.
2016-11-01 21:37:53 +00:00
Mike Place
7d7941598e
Merge branch 'carbon' into carbon_develop 2016-10-31 23:57:16 +13:00
Mike Place
534a21e8d6
Remove test
I don't know why this would exist in a client test. This is tested extensively
already in the loader tests, which is the appropriate place.
2016-10-31 20:39:34 +13:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
2016-10-28 11:58:41 -06:00
Mike Place
6cb7ce2c0f
Fix typo in pkg upgrade test 2016-10-28 20:23:26 +09:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
rallytime
190ec32283 Merge branch 'carbon' into 'develop'
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
2016-10-26 10:09:26 -06:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon 2016-10-26 14:08:03 +09:00
Mike Place
760ed9f56d Merge pull request #37239 from Ch3LL/fix_cloud_timeout
Fix cloud tests timeout
2016-10-26 10:11:52 +09:00
Ch3LL
394fccf556 fix run_cloud timeout 2016-10-25 13:30:41 -06:00
Ch3LL
23947c5944 change timeout for cloud tests 2016-10-25 13:27:57 -06:00
Eric Radman
3829b7592f Update configuration examples for Joyent
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
2016-10-25 10:43:32 -06:00
rallytime
70851807bd Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/modules/status.py
2016-10-24 09:35:00 -06:00
Eric Radman
30146115ee Update configuration examples for Joyent (#37153)
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
2016-10-22 07:58:46 -06:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon'
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
2016-10-21 15:50:03 -06:00
rallytime
db3150b3f1 Merge branch 'carbon' into 'develop'
Conflicts:
  - doc/topics/installation/windows.rst
2016-10-21 15:19:16 -06:00
Nicole Thomas
2bc5dedd06 Allow the minion test daemons a couple of tries to connect to the master (#37150)
When running the tests with the tcp transport, we are not as forgiving
with the minion connection process as we are in ZMQ. In ZMQ, we attempt
to connect to the master. If it isn't up yet, we wait and try again. In
TCP, we try to connect to the master once, realize it's not up (because
the master process takes longer to spin up than the minions) and crash
and bail out.

This just gives the master a little more time to come up by having the
minions try to connect a couple more times.
2016-10-21 14:50:39 -06:00
Nevins Bartolomeo
bc4b0e7cda adding test for saltenv in file.recurse source url 2016-10-21 08:44:58 -04:00
Mike Place
f4ce268d51
Don't run ssh tests if we can't reach external server 2016-10-21 19:47:05 +09:00
Mike Place
169a82e62b Merge pull request #37119 from jfindlay/log_proc_user
log.setup: only assign user if defined
2016-10-21 14:14:55 +09:00
Megan Wilhite
f22c686b34 fix digital ocean image name in profile (#37126)
* fix digital ocean image name in profile

* remove skip and fix test
2016-10-20 16:08:50 -06:00
Justin Findlay
1d503f032c tests.integration: pass opts as a dict 2016-10-20 14:16:35 -06:00
twangboy
f1c8d98119 Skip weird_install test on Mac OS X 2016-10-20 11:05:34 -06:00
twangboy
90de794290 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-10-20 11:05:28 -06:00
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09:00
Mike Place
430ea9e780 Revert "Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running" 2016-10-20 19:48:59 +09:00
rallytime
b445a5e579 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/cp.py
2016-10-19 18:24:04 -06:00
Denys Havrysh
d1ab98b459 cp.get_url: update usage doc and add tests for file:// URL with dest=None 2016-10-18 13:39:55 +03:00
msiebeneicher
04d5b1852f updated test_list_json_out test 2016-10-18 10:58:38 +02:00
msiebeneicher
d05ef0b209 Merge remote-tracking branch 'remotes/upstream/develop' into improvement/fix_log_output_for_json_and_yaml
* remotes/upstream/develop: (257 commits)
  Removed extra whitespace
  add the ability to verify github webhook hmac signatures
  Improve the sparse docs on python renderer
  Remove trailing whitespace
  Letsencrypt has been renamed to certbot
  Add support for standalone mode
  Pass --quiet to suppress the certbot/letsencrypt dialog
  Fix failing network unit test (#37033)
  Use a default prefix for the mkstemp utils function (#37022)
  CkMinions.connected_ids fix: continue if cache.fetch raises exception
  fire on local (#37015)
  document master_type disable (#37014)
  opkg module: Add 'version', 'reinstall', and 'only_upgrade' to install (#37008)
  Keep minion schedule when recreate loaders. (#37004)
  Fix lint
  opkg: Support ignore_epoch argument in version comparisons (#37007)
  Revert "[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname"
  add webhook engine
  Versionadded for process_dependency_links kwarg in virtualenv_mod state (#37006)
  Versionadded tag for new update_head option in hg state (#37005)
  ...
2016-10-18 10:43:02 +02:00
Denys Havrysh
c7cf79e959 cp.get_url: add note and test for https:// URL with `dest=None` 2016-10-17 17:39:52 +03:00
Denys Havrysh
ff55f77179 cp.get_url: write more verbose docstring 2016-10-17 16:01:02 +03:00
Denys Havrysh
94a34a08ba cp.get_url: add integration tests 2016-10-17 15:46:49 +03:00
Erik Johnson
1caf1f6770 Use a default prefix for the mkstemp utils function (#37022)
* Move salt.utils.mkstemp() into salt.utils.files

Also use a default prefix

* update refs to salt.utils.mkstemp

* Update test to use new path to mkstemp helper func
2016-10-16 16:12:56 -06:00
rallytime
b7d9bf0281 Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-14 12:06:31 -06:00
rallytime
a5ae737057 Skip pkg.upgrades test on distros other that Suse in 2016.3
Refs #36450 and #36980
2016-10-13 12:02:22 -06:00
rallytime
21921af9a7 Skip pkg.upgrade test if pkg install/upgrade has problems
Refs #36450
2016-10-13 11:57:27 -06:00
rallytime
0a5b1f5466 Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-13 09:58:18 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-10-12 15:26:27 -06: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
Andrew Pashkin
304516420c Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running (#36875)
* Add Visual Studio Code related directory .vscode/ to .gitignore

* Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running
2016-10-12 13:20:30 -06:00
msiebeneicher
db19e31038 fixed integration tests after json output change 2016-10-12 16:05:29 +02:00
msiebeneicher
9e264812cb unify json output tests for different plattform / lib versions 2016-10-12 12:39:48 +02:00
rallytime
32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades
yumpkg.list_upgrades returns an empty dictionary when no upgrades are available.
We need to check for this situation and skip the test if no upgrades are present.

Fixes the test failure on Fedora 24 on Jenkins currently, but also protects against
any potential failures for other RHEL-based distros that aren't currently failing
because "ret" is populated with a dictionary of upgrades.
2016-10-11 16:50:50 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-10 10:18:02 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
2016-10-07 09:51:21 -06:00
Mike Place
34007be671
Merge branch 'carbon' into carbon_develop 2016-10-06 00:23:22 +09:00
Mike Place
53f1523cb8 Merge pull request #36790 from cachedout/pr-36727
Merge forward carbon to develop
2016-10-05 23:57:23 +09:00
Mike Place
aa7bfb422c Merge pull request #36578 from lomeroe/add_states_retry_option
add global 'retry' option to state processing
2016-10-05 22:47:57 +09:00
Mike Place
bd712bb0ff
Fix test suite hanging on shutdown 2016-10-05 17:14:27 +09:00
Mike Place
71e35d3c82
Check for a second place a transient error can occur in an SSH test 2016-10-05 16:32:57 +09:00
Ethan Moore
2ad701784a add integration tests for retry state option 2016-10-04 20:06:59 +00:00
Mike Place
8ff69bf0c7 Merge pull request #36764 from cachedout/more_pip_test_fixing
Another bit of detection for failed pip tests
2016-10-04 22:05:29 +09:00
Mike Place
b9f5343449
Another bit of detection for failed pip tests
Don't bail out if the download failed for some reason on the remote end
2016-10-04 21:09:47 +09:00
Justin Findlay
b5fcca9983 modules.archive int tests: check for gzip, rar
Similar to 8733586.
2016-10-03 11:14:05 -06:00
Mike Place
93f1daa4ce Merge pull request #36744 from cachedout/fix_test_shutdown
Fix issue where test suite could hang on shutdown
2016-10-04 00:37:00 +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
C. R. Oldham
e6897da166 Skip test if we can't get an earlier package. 2016-09-30 17:30:21 -06:00
C. R. Oldham
8e68058877 Handle cases where the return dict from a pkg.upgrade might have a "changes" key. 2016-09-30 16:33:56 -06:00
rallytime
5d7b4e4511 Merge branch 'carbon' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/logging/index.rst
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
  - salt/modules/gpg.py
2016-09-30 16:10:33 -06:00