Commit Graph

3087 Commits

Author SHA1 Message Date
Mike Place
85907ef008 Merge pull request #36485 from gtmanfred/carbon
clean up keystone tests
2016-09-22 13:12:36 +09:00
Daniel Wallace
8deb342488 clean up keystone tests
Don't want to overwrite the stuff for the glance tests
2016-09-21 14:43:42 -05:00
rallytime
77f8120395 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/topics/installation/windows.rst
  - salt/engines/sqs_events.py
  - salt/grains/core.py
2016-09-21 10:43:38 -06:00
Mike Place
a41022efc3 Merge pull request #36447 from jfindlay/bp-36431
Backport #36431: Try/except psutil process access in OSX
2016-09-21 14:52:39 +09: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
rallytime
7bcbf8dc36 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
2016-09-20 10:43:55 -06:00
rallytime
2740fb7bfd Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/grains/core.py
2016-09-20 10:39:53 -06:00
Mike Place
ae1fc430c2 Merge pull request #36424 from jfindlay/bp-36194
skip some mac_timezone tests
2016-09-20 15:43:47 +09:00
Justin Findlay
a20a2148bf skip some mac_timezone tests 2016-09-19 16:48:22 -06:00
Erik Johnson
aab02f28b4 Ensure we have a test venv created using virtualenv < 13.0
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
2016-09-19 14:27:30 -06:00
Thomas S Hatch
5625827ee2 Merge pull request #36378 from terminalmage/issue36321
git.latest Treat an up-to-date checkout with local changes as up-to-date
2016-09-19 12:43:29 -06:00
rallytime
c64e489f6f Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-19 11:22:54 -06:00
Erik Johnson
bb4d69f58a git.latest: fail gracefully for misconfigured remote repo (#36391)
* git.latest: fail gracefully for misconfigured remote repo

When the remote repo's HEAD refers to a nonexistent ref, this was
causing a traceback when we tried to check if the upstream tracking
branch needed to be changed after cloning the repo. This commit fixes
this traceback by gracefully failing the state when the remote HEAD is
not present in the ``git ls-remote`` output, but the desired remote
revision doesn't exist.

Additionally, a similar graceful failure now happens if the state is run
again after we gracefully fail the first time, and we need to set the
tracking branch. Trying to set the tracking branch when there is no
local branch would fail with an ambiguous error like "fatal: branch
'master' does not exist", so before we even attempt to set the tracking
branch, the state is failed with a more descriptive comment.

* Add integration test for #36242
2016-09-19 09:33:00 -06:00
Erik Johnson
7b1f621206 Fix git.latest test with local changes to reflect changes in state 2016-09-17 21:56:31 -05:00
Justin Anderson
b2a1779383 Close open socket on freebsd 2016-09-15 15:37:00 -06:00
Mike Place
52e9ba4076 Revert "Skip some tests on MacOS" (#36341) 2016-09-15 11:12:04 -06:00
Thomas S Hatch
d69878127e Merge pull request #36284 from jfindlay/mac_skip
Skip some tests on MacOS
2016-09-15 09:46:30 -06:00
Erik Johnson
d9726f73a7 Remove reference to no-longer-skipped test 2016-09-15 08:57:38 -05:00
Erik Johnson
83cb406cc9 Merge branch 'twangboy-mac_pip_tests' into carbon 2016-09-15 08:56:49 -05:00
Erik Johnson
55fb5f4d2f Merge branch 'mac_pip_tests' of https://github.com/twangboy/salt into twangboy-mac_pip_tests 2016-09-15 08:56:21 -05:00
Erik Johnson
f4dded464c Ensure we have a test venv created using virtualenv < 13.0
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
2016-09-14 22:42:39 -05:00
Justin Findlay
30fd9a622a skip pip weird install test 2016-09-14 14:40:43 -06:00
Justin Findlay
d0c4846c89 skip tests that timeout on MacOS
Due to the changes in how the test daemons are handled, it seems.  The
tests fail intermittently.
2016-09-14 14:40:43 -06:00
rallytime
dd1769ea58 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/modules/file.py
  - salt/runners/cloud.py
  - salt/utils/gitfs.py
2016-09-14 13:08:42 -06:00
rallytime
9e15df9b23 Switch the order of the decorator
When @requires_system_grains is listed before other decorators, wrapper
function gets confused on where the grains kwarg should go.
2016-09-14 12:12:21 -06:00
Mike Place
ee997be6d8 Fix pkg group test by passing a list instead of str
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
2016-09-14 09:53:10 -06:00
rallytime
c7d8867096 Gate the pkg.group_installed state test: not all pkg modules have group_install
Refs #35907
2016-09-14 09:25:56 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
2016-09-14 09:15:29 -06:00
Mike Place
6a76a3a7e0 Merge pull request #36265 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-09-14 14:32:15 +09:00
Mike Place
8119eb6a41 Merge pull request #36269 from gtmanfred/carbon
begin adding tests for the openstack cloud provider
2016-09-14 14:24:42 +09:00
Pablo Suárez Hernández
ed2d2bd331 Integration tests fixes for 2015.8 (#36262)
* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 15:24:06 -06:00
Erik Johnson
fd28ca058f Fix for new integration test for fileserver.clear_file_list_cache
The test suite actually has a ``prod`` env, but this test only considers
the ``base`` env. If a test is run which requests a file (or just the
file/dir/symlink/... list) from the ``prod`` env, then this will result
in the ``prod`` env's file list caches being present, and they will be
removed when the ``fileserver.clear_file_list_cache`` runner is
executed, showing up in the return data and causing the test to fail.

This tweak to the test ensures that we will always have a file list
cache for ``prod`` present, and adjusts the necessary asserts in the
test to expect the ``prod`` env in the return data from the runner.
2016-09-13 15:55:51 -05:00
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263)
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 12:40:56 -06:00
twangboy
c01ec228e1 Skip weird_install test on Mac OS X 2016-09-13 11:35:38 -06:00
Daniel Wallace
2d716131da Add test to check openstack in libcloud
With apache-libcloud 0.20.0
2016-09-13 10:25:43 -05:00
Daniel Wallace
b488cf2420 add __main__ function for keystone test 2016-09-13 10:23:04 -05:00
rallytime
e6a412dd49 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-13 08:23:51 -06:00
Mike Place
de06116075 Merge pull request #35688 from cachedout/issue_33525
Splat serializer default configs into the serializer kwargs
2016-09-13 18:21:46 +09:00
Mike Place
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests
Fix test_launchctl test in mac_service
2016-09-13 16:31:46 +09:00
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150
Add a runner function to clear fileserver list caches
2016-09-13 09:17:05 +09:00
Ch3LL
9ede50b451 fix archive test to only run on redhat 2016-09-12 15:43:06 -06:00
Erik Johnson
b7a1a67828 Improve accuracy of fileserver runner tests
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244, but these
tests will help keep this sort of issue from regressing.
2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844 Add integration tests for fileserver.clear_file_list_cache 2016-09-12 16:29:10 -05:00
twangboy
4ae8a43435 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-09-12 12:17:30 -06:00
Mike Place
1eb67df61e Merge pull request #36198 from gtmanfred/carbon
add keystone state integration tests
2016-09-11 18:16:38 +09:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone
skip some mac_timezone tests
2016-09-10 09:07:07 +09:00
Daniel Wallace
1c31d5e464 add keystone state integration tests
fix api_version for using connection_args
2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945)
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
2016-09-09 12:58:50 -06:00