valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,628 Commits 24 Branches 182 Tags 341 MiB
eb04ed7eef
Commit Graph

630 Commits

Author SHA1 Message Date
Megan Wilhite
a8a6215663 refine the os detection in archive test (#38807) 2017-01-18 11:03:55 -07: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
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
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
rallytime
f2c045520d Write an integration test demonstrating the issue 2016-12-01 16:52:03 -07:00
Erik Johnson
23bb90a7ce Add integration test for archive.extracted with user/group set to root 2016-11-30 13:11:41 -06: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
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07: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
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
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
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
Nevins Bartolomeo
bc4b0e7cda adding test for saltenv in file.recurse source url 2016-10-21 08:44:58 -04: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
rallytime
861a001749 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-23 15:06:28 -06:00
Nicole Thomas
07c9d040c0 Fixup the rabbitmq_user state test failure (#36541) 2016-09-23 15:05:40 -06:00
rallytime
1755f22de1 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-22 10:01:17 -06:00
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
rallytime
8805b57a1e Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-21 09:32:53 -06:00
Mike Place
41d3c09857 Merge pull request #35433 from terminalmage/issue34790 
git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures
 2016-09-21 16:02:18 +09: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
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
71b51f49ba Add integration tests for PR #35433 2016-09-17 22:55:47 -05:00
Erik Johnson
7b1f621206 Fix git.latest test with local changes to reflect changes in state 2016-09-17 21:56:31 -05: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
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
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
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
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