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
81,658 Commits 24 Branches 182 Tags 341 MiB
1b28c67047
Commit Graph

9893 Commits

Author SHA1 Message Date
Bo Maryniuk
1b28c67047 Add unit test for utilising host name as "127" 2017-05-16 12:17:13 +02:00
Erik Johnson
dcb0d63883 Update test to reflect additional calls to os.path.isfile() 2017-05-06 01:51:11 -05:00
Erik Johnson
772167306c Merge pull request #41015 from gtmanfred/docker 
Allow docker.call to run as non-root user
 2017-05-06 01:21:05 -05:00
Nicole Thomas
272b063963 Merge pull request #41095 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-05 13:03:22 -06:00
Mike Place
5dee0b4804 Merge pull request #37952 from lorengordon/jinja-filter-decorator 
Adds an alternate implementation for a jinja filter decorator
 2017-05-05 11:08:20 -06:00
Mike Place
330e717150 Merge pull request #40977 from amendlik/kernelpkg 
kernelpkg module
 2017-05-05 10:21:12 -06:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
Mike Place
127eb04ff6 Merge pull request #41082 from rallytime/fix-spm-unit-tests 
Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests
 2017-05-05 10:05:43 -06:00
Nicole Thomas
bae17ed4b9 Merge pull request #41085 from Ch3LL/fix_azure 
Fix azure tests to query provider
 2017-05-05 09:49:58 -06:00
Nicole Thomas
f4eaa8e44a Merge pull request #41086 from twangboy/fix_test_pkg 
Fix test pkg
 2017-05-05 09:49:16 -06:00
Adam Mendlik
2bc930acb3 Fix linter errors 2017-05-05 06:27:37 -06:00
Adam Mendlik
9f13ce9ee2 Fix kernelpkg.latest_available when no upgrades are available 2017-05-05 05:51:11 -06:00
Loren Gordon
bff15d4c61 Updates jinja template tests with salt context 2017-05-05 07:21:40 -04:00
Loren Gordon
ae89f14178 Updates tests to get custom filters from decorator class 2017-05-05 07:21:40 -04:00
Adam Mendlik
741fd9d1ee Rename kernelpkg.current to kernelpkg.active for clarity 2017-05-04 19:15:04 -06:00
twangboy
e4c5156d77 Fix some lint 2017-05-04 16:45:58 -06:00
twangboy
20da5f5d4b Add software def for putty 2017-05-04 15:16:21 -06:00
twangboy
75072b1c83 Fix pkg tests for windows 2017-05-04 15:13:41 -06:00
Ch3LL
1eda73bd61
fix azure tests to query provider 2017-05-04 16:50:24 -04:00
rallytime
891e174f71 Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests 
Fixes the spm unit test failures in CentOS 6. These calls to the client need to be
patched so they don't interact with other unit tests.
 2017-05-04 14:30:49 -06:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-04 11:51:32 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
Mike Place
041e385ee4 Merge pull request #41016 from secumod/develop 
Read some hardware grains from sysfs on Linux if available
 2017-05-04 09:46:01 -06:00
Mike Place
ff39613a53 Merge pull request #41049 from Ch3LL/fix_wheel_test 
fix integration wheel test_gen test
 2017-05-04 09:33:58 -06:00
Nicole Thomas
2bf02fad81 Merge pull request #41050 from terminalmage/git_pillar-tests 
Fix git_pillar integration tests on Arch
 2017-05-03 16:53:31 -06:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Erik Johnson
ee493bae47 Update package targets for Arch pkg tests 
Something else is installing pytz (likely via pip), causing filesystem
conflicts when the pkg integration tests try to install python2-pytz as
a dep of python2-django.

This commit also changes a bunch of the other tests so that they are
explicitly skipped instead of just being no-ops in cases where they are
not configured to be run. This provides more accurate information in the
overall test results.
 2017-05-03 17:02:32 -05:00
Erik Johnson
f77393b80d Skip git_pillar integration tests on cent6 
Cent6 has too old of a version of git to handle the make_repo func that
spawns the git repos used in these tests.
 2017-05-03 16:36:36 -05:00
Erik Johnson
a94d081004 Add check for git-http-backend 
This allows for more graceful test failures when the libexec dir is
different from what the test class determines it should be.
 2017-05-03 15:16:16 -05:00
Erik Johnson
33515f6a14 Fix git_pillar integration tests on Arch 
The location of the git-http-backend is within /usr/lib instead of
/usr/libexec.

This also uncomments a line that was commented out for troubleshooting
purposes.
 2017-05-03 14:49:14 -05:00
Ch3LL
ba223827b9
fix integration wheel test_gen test 2017-05-03 15:37:44 -04:00
Mike Place
43af2669f6 Merge pull request #41010 from twangboy/fix_test_standard 
Fix test_full_returns integration test on Windows
 2017-05-03 12:18:25 -06:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning 
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
 2017-05-03 10:55:26 -06:00
rallytime
b93e35dd06 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/engines/docker_events.py
 2017-05-03 10:00:24 -06:00
Ignat Korchagin
0d6da33391 Update grains unit test to support reading firmware grains from sysfs in Linux 2017-05-03 13:10:29 +00:00
Daniel Wallace
97e67e262f fix unit tests for dockermod 2017-05-02 18:50:03 -06:00
Daniel Wallace
9c23fdc713 pylint again 2017-05-02 17:28:02 -06:00
Daniel Wallace
3fe8af4316 remove opensuse image too 2017-05-02 16:43:42 -06:00
Daniel Wallace
a09eb0453a clean up test 2017-05-02 16:39:07 -06:00
Daniel Wallace
185c405265 fix dockermod test 2017-05-02 16:31:38 -06:00
rallytime
bed524a731 Update test hash to be sha256 instead of md5 2017-05-02 16:20:06 -06:00
Daniel Wallace
948830a4cb add tests 2017-05-02 16:16:51 -06:00
twangboy
c7d164423e Increase timeout of run_function 2017-05-02 16:01:06 -06:00
Nicole Thomas
1c0c53bcd0 Merge pull request #41006 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-02 12:49:23 -06:00
twangboy
3ef4734d0e Increase timeout for Windows 2017-05-02 11:37:01 -06:00
Mike Place
044e0b2063 Merge pull request #40860 from twangboy/change_broadcast 
Remove dependency on win32gui
 2017-05-02 10:45:51 -06:00
Mike Place
2cad90dd9e Merge pull request #40996 from terminalmage/issue40946 
Do not automatically unmask services to start/restart/etc. them
 2017-05-02 09:56:23 -06:00
rallytime
ecb962cdee Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-02 09:00:22 -06:00
Adam Mendlik
74c7899f2a Rename kernelpkg module files to kernelpkg_linux_<pkgmanager> 
This groups them together lexicographically and makes it clear which
package manager each one supports.
 2017-05-01 18:22:34 -06:00
Erik Johnson
39157b40ed Fix some git_pillar integration test failures 
For some reason these were not failing when I opened #40777, but now
that the PR is merged are failing for PR builds (as well as locally in
my test env). This fixes those failures.
 2017-05-01 17:13:42 -05:00