Commit Graph

3307 Commits

Author SHA1 Message Date
rallytime
eb61788f87 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
2017-02-01 16:36:45 -07:00
rallytime
a782b00ee1 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cloud/clouds/openstack.py
2017-02-01 13:35:10 -07:00
Mike Place
4ed8085d27 Merge pull request #39060 from harisokanovic/dev/hokanovi/hwclock-sync
system: Update hardware clock on date/time change
2017-02-01 12:22:20 -07:00
Mike Place
cc9b69b6bc Merge pull request #39091 from terminalmage/update-test-valid-docs
Run test_valid_docs in batches
2017-02-01 12:09:04 -07:00
Erik Johnson
d76f0380d0 add debug logging for batch vars 2017-02-01 00:05:21 -06:00
Erik Johnson
b4afea2a25 Don't fail test if data is empty
This keeps trimmed output from failing the test. We are still testing
with a specific module lower down in the test, so this doesn't reduce
our test coverage.
2017-02-01 00:05:21 -06:00
Erik Johnson
909916c78e Run test_valid_docs in batches
This test fails often due to being trimmed, thanks to
salt.utils.dicttrim trimming values > max_event_size.

This commit changes this test so that it runs sys.doc twice, ensuring
that the return from sys.doc (for now) is not trimmed.
2017-02-01 00:05:05 -06:00
Haris Okanovic
c5f832b9e3 system: Update hardware clock on date/time change
Update hardware clock so that date/time changes persist
through reboot.

Add hwclock check to system integration test. Bump tolerance
of _same_times() helper to account for longer run-time of set
operations. Updating hardware rtc's can take more than 2 seconds.

Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
Reviewed-by: Sergey Kizunov <sergey.kizunov@ni.com>
Reviewed-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Reviewed-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
2017-01-31 17:40:40 -06:00
Mike Place
1ccb365945 Merge pull request #39002 from rallytime/fix-38111
Pass win_* options as kwargs when calling file.manage_file
2017-01-31 13:51:39 -07:00
Erik Johnson
bcee3d1ef6 Move fileclient tests to tests/integration/fileserver/fileclient_test.py (#39081)
Being in the root of tests/integration/, these were not being run in
jenkins and would only run if executed manually using the -n flag in
runtests.py.
2017-01-31 13:44:50 -07:00
twangboy
c704eaa175 Fix geteuid stacktrace on Windows 2017-01-30 15:36:08 -07:00
rallytime
43dba1bf78 Skip new managed file state test on Windows 2017-01-30 13:40:25 -07:00
rallytime
8e17c96e02 Write failing test for Issue #38111
Test calls "file.managed" using the "check_cmd" kwarg with the
state provided as a reproducible test case for the issue.
2017-01-27 11:28:54 -07:00
Nicole Thomas
7c93bcbb2a Add one more option to "allow_failure" for doc test (#38998) 2017-01-27 09:43:04 -07:00
rallytime
089ad59b90 Update the vsphere execution module docs to satisfy failing doc test
- Added the "CLI Example:" syntax to function that were missing it
- Added docs to functions missing any docs and CLI examples
- Added to functions to allow_failure in sysmod test as needed
- Also adjusted the ordering of the allow_failure structure to make it
  easier to see which modules/funcitons were included (alphabetize)
2017-01-26 11:56:06 -07:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/utils/win_functions.py
2017-01-25 09:59:29 -07:00
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop'
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
2017-01-20 12:07:19 -07:00
Megan Wilhite
a8a6215663 refine the os detection in archive test (#38807) 2017-01-18 11:03:55 -07:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop'
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
2017-01-17 09:50:06 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
2017-01-16 18:54:14 -07:00
Eric Radman
fa3648c576 Respect follow_symlinks when run with test=True
Previously file.directory correctly sets the permissions of the target
of a symlink, but it did not return the correct result during a dry run.
This change plumbs the follow_symlinks parameter to test-only functions.
2017-01-16 03:04:50 -05:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3'
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
2017-01-15 16:07:55 -07:00
rallytime
b910499dbe Various follow up fixes
Merge branch '2015.8.12_follow_up' into '2015.8'
2017-01-13 14:40:17 -07:00
rallytime
34282322c0 Clean up tests and docs for batch execution
Batch execution was removed from NetapiClient and Saltnado in
previous commits. This change is a follow up that removes related
test cases and doc references.
2017-01-09 11:29:34 -07:00
Mike Place
956602244d Merge pull request #36759 from msiebeneicher/improvement/fix_log_output_for_json_and_yaml
Fix log output for `--output=yaml`
2017-01-06 14:44:53 -07:00
Mike Place
993596b10a Merge pull request #38218 from rallytime/cmd-run-alias-deprecation
Remove support for aliasing cmd.run to cmd.shell
2017-01-06 14:36:18 -07:00
rallytime
65032d885e Update shell enabled integration tests with cmd.run aliasing removed
With support for cmd.run --> cmd.shell aliasing removed in this PR,
some of the tests looking for the old behavior need to be adjusted.

1. `test_template_default_enabled` was renamed to `test_template_shell`
and the cmd.run call was changed to a cmd.shell call. Since the
aliasing for cmd.run to cmd.shell has been removed for templates, this
test is no longer necessary. Instead of removing the test, we can use
it to check that cmd.shell works correctly in a state + template
context.
2. The `python_shell=False` kwarg was removed from the template in the
`test_template_default_disabled` test since python_shell=False should be
the default now. (Note the test was renamed for clarity.)
2017-01-06 14:17:28 -05:00
rallytime
342a5ac0b8 Merge branch '2016.11' into 'develop'
No conflicts.
2017-01-06 10:31:51 -05:00
rallytime
44d09b8606 Add 'travisci.parse_qs' to the allow_failures option
Fixes the `integration.modules.sysmod.SysModuleTest.test_valid_docs`
test failure which thinks a CLI example is needed.
2017-01-05 12:27:59 -05:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
2017-01-04 16:54:58 -05:00
Megan Wilhite
1c951d152b fix gce image bug (#38542) 2017-01-04 09:08:04 -05:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Elias Wulcan
266e0a465c Fixed nested orchestrate not respecting failures
Client was only setting success to false if the function called raised
an exception. This commit changes it to verify the content of return
value with check_state_result
2016-12-19 10:29:05 +01:00
rallytime
05ec9f4b5b Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/netapi/rest_cherrypy/app.py
2016-12-15 20:47:35 -07:00
Elias Wulcan
5f9b6c8ba4 Fixed nested orchestrate not respecting failures
Client was only setting success to false if the function called raised
an exception. This commit changes it to verify the content of return
value with check_state_result
2016-12-15 10:33:25 +01:00
Erik Johnson
6442f8a7b5 Add tests for --strip/--strip-components
Also add a test for an unspecified archive_format, as this did not have
a test case.
2016-12-14 21:57:14 -06:00
rallytime
29f45c192c Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/cloud/clouds/ec2.py
  - salt/modules/grains.py
2016-12-12 11:23:57 -07:00
Nicole Thomas
23c039347e Merge pull request #38182 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2016-12-09 14:25:47 -07:00
rallytime
609f814454 Reset socket default timeout to None (fixes daemons_tests failures)
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
2016-12-09 13:50:48 -07:00
Nicole Thomas
fc95045ba1 Reset socket default timeout to None (fixes daemons_tests failures) (#38181)
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
2016-12-09 13:49:44 -07:00
rallytime
627242ab5d Merge branch '2016.3' into '2016.11'
Conflicts:
  - tests/unit/config/config_test.py
2016-12-09 11:45:14 -07:00
Mike Place
65b2ad7b14 Merge pull request #38163 from Ch3LL/enabled_ec2_cloud
enabled ec2 cloud tests
2016-12-09 11:01:57 -07:00
Denys Havrysh
a449980672 Correct cp.get_file_str docstring and add integration tests 2016-12-09 13:05:57 +02:00
Ch3LL
be74c45463 enabled ec2 cloud tests 2016-12-08 12:39:42 -07:00
Mike Place
cfc6f4b530 Merge pull request #38055 from whiteinge/sls-file-running-dict
Add the __sls__ field to the highstate output (the running dict)
2016-12-08 11:04:05 -07:00
Seth House
84dce83860 Switch type comparison to isinstance 2016-12-08 02:38:34 -07:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
2016-12-07 16:31:11 -07:00
rallytime
fec9dec23a Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/daemons_test.py
  - tests/unit/states/file_test.py
2016-12-06 16:23:51 -07:00