valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,514 Commits 24 Branches 182 Tags 341 MiB
344295666b
Commit Graph

9909 Commits

Author SHA1 Message Date
C. R. Oldham
19db038b99 Fix test--use proxy_config instead of minion_config 2017-05-12 14:01:54 -06:00
twangboy
e9df95d2a0 Add timout in tests instead of publish 2017-05-12 11:32:04 -06:00
Mike Place
a0a2646007 Merge pull request #41194 from rallytime/md5-warning-cleanup 
Update fingerprint hash type default from md5 to sha256
 2017-05-12 11:13:18 -05:00
rallytime
8dfa8d1d19 Pass the fingerprint_hash_type through for gitfs sshd tests 2017-05-11 12:29:51 -06:00
Nicole Thomas
88eabbb57d Merge pull request #41179 from rallytime/fix-jinja-template-test 
Split up test asserts in jinja template unit test
 2017-05-11 10:23:16 -06:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256 
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
 2017-05-11 09:33:45 -06:00
rallytime
d4e42b8e74 Use cptc.BaseRestCherryPyTest as test class 2017-05-11 09:09:40 -06:00
rallytime
738681c20f Pylint fix 2017-05-11 09:03:10 -06:00
rallytime
6729587d54 Spelling fix 2017-05-10 16:59:39 -06:00
rallytime
3a5419ba3f Split up test asserts in jinja template unit test 
Due to a bug in the equality handler, this test was failing on
CentOS 6 running Python 2.7.13. This PR splits up the test assertions
into several different pieces in order to cover all the possible
use cases, but also pass on CentOS 6.
 2017-05-10 16:55:37 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
Nicole Thomas
496fa3accd Merge pull request #41156 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-10 15:29:54 -06:00
Nicole Thomas
b136b15330 Merge pull request #41104 from Ch3LL/add_jobs_test 
Add test to query results of /jobs call in api
 2017-05-10 14:11:07 -06:00
Erik Johnson
77ae15e41b Merge pull request #41155 from rallytime/git-test-fixes 
Gate and skip git state integration tests when git version is older
 2017-05-10 14:53:12 -05:00
rallytime
9014033726 Use LoaderModuleMockMixin for setting up default grains/salt dunders 2017-05-10 13:49:43 -06:00
Nicole Thomas
e7b714b6e1 Merge pull request #41171 from terminalmage/remove-git_pillar_warning 
Remove git_pillar warning from integration suite startup
 2017-05-10 11:36:54 -06:00
rallytime
23ee513397 Pylint: Add extra line above function declaration 2017-05-10 11:32:41 -06:00
Ch3LL
dac16583b7
add test to query results of /jobs call in api 2017-05-10 12:39:17 -04:00
rallytime
c282533612 Use with patch.dict for timezone.__grains__ dictionaries 2017-05-10 10:32:24 -06:00
Erik Johnson
03b5420988 Remove git_pillar warning from integration suite startup 
This is no longer needed since the git_pillar configuration has been
removed from the suite's master config file now that git_pillar
integration tests have been added.
 2017-05-10 11:13:43 -05:00
Erik Johnson
018ec5fff9 Make git version checks into decorators 
Also fix a bug in one test where edits to a file are made in the current
working directory and not the git repo being used for the test.
 2017-05-10 10:40:12 -05:00
lomeroe
2af89f2165 update mock data 2017-05-10 10:33:34 -05:00
lomeroe
b7fa115a59 update win_dns_client tests with correct module names 2017-05-10 10:33:33 -05:00
rallytime
baa8e3f5a6 Move new timezone_test.py tests over to test_timezone.py tests 2017-05-09 16:33:18 -06:00
twangboy
bc827ad8a7 Fix unit test 2017-05-09 16:00:24 -06:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
rallytime
317b5e39bd Add git_opts flag to _check_git_version helper funciton 
We only need to skip the tests with git versions < 1.7.2 when
the test uses the git_opts option.
 2017-05-09 13:52:47 -06:00
rallytime
4019db15fb Skip git state tests when using the "git_opts" option 
And also add some gates for if the git version is too low in general.

This fixes the test failures on CentOS 6 currently in the nitrogen branch.
 2017-05-09 13:46:24 -06:00
Mike Place
a2f359fa13 Merge pull request #40852 from isbm/isbm-fix-coregrains-constants-bsc#1032931 
Isbm fix coregrains constants bsc#1032931
 2017-05-09 12:35:45 -06:00
Nicole Thomas
f8bfd36519 Merge pull request #41112 from rallytime/suse-pkg-test 
Make sure "version" exists before looking for pkg key
 2017-05-09 10:00:52 -06:00
Nicole Thomas
1a1c80f67c Merge pull request #41109 from rallytime/fix-auth-unit-tests 
Add calls to salt.client.get_local_client to patches list in auth unit tests
 2017-05-09 10:00:08 -06:00
Bo Maryniuk
f3b12a3f5b Do not use multiple variables in "with" statement as of lint issues 2017-05-09 10:17:49 +02:00
Theophile Meneau
d8766562c9 fix incorrect service.running success response 
when enable=None and init script returns 0,
but service failed to start.

Fixes #41125
 2017-05-08 10:25:21 -04:00
Bo Maryniuk
35a8d99934 Disable the test for a while 2017-05-08 13:49:54 +02:00
Bo Maryniuk
76cb1b7150 Rewrite test case for using no patch decorators 2017-05-08 10:41:50 +02:00
Erik Johnson
ffe4bc3d5c update unit test to reflect new behavior 2017-05-06 01:29:49 -05:00
Erik Johnson
2af89beb53 Merge pull request #41103 from lorengordon/win.get_route 
Adds a get_route() function to win_network.py
 2017-05-06 01:19:41 -05:00
Erik Johnson
92011dbe5f Fix "latest" keyword for version specification when used with aggregation 
The "latest" keyword was only implemented when both "name" and "version"
were used, and not for "pkgs". But mod_aggregate puts all packages into
a single low chunk, within "pkgs". This means that using aggregation in
conjuntion with the "latest" keyword no longer resolves the latest
version and thus breaks these states.

This fixes the problem by moving the logic for resolving the "latest"
keyword into _find_install_targets(). It also makes some improvements to
the logic we use to ensure only one package DB refresh is performed per
Salt run, by making the pkg.refresh_db functions handle removing the
rtag file, instead of requiring a call to a helper function everywhere
in the pkg state where we might be calling a function that refreshes the
package DB.
 2017-05-06 00:46:06 -05:00
C. R. Oldham
3be90cc9f4 Rescue proxy_auto_tests PR from git rebase hell 2017-05-05 17:04:00 -06:00
rallytime
16b4b9eb43 Make sure "version" exists before looking for pkg key 
Fixes the test failure happening on the SUSE Leap build in the nitrogen
branch.

Version can be an empty dictionary and pass the check, but then we hit
a key error on the next line. Let's avoid that.

This failure was caused by the changes in #41086.

Fixes https://github.com/saltstack/salt-jenkins/issues/332
 2017-05-05 16:29:56 -06:00
Loren Gordon
93ce5644ea Adds test for win_network.get_route 2017-05-05 17:32:50 -04:00
rallytime
6e857681d4 Add calls to salt.client.get_local_client to patches list in auth unit tests 
We need to mock the calls to `salt.client.get_local_client` in the
tests.unit.test_auth.py file. Without these mocks, there are many tests
that fail when the entire set of unit tests runs. (Specifically, these fail
with both the module and state boto_apigateway unit tests run.)

This mocked patch is similar to the change in PR #41082 and fixes all 16 test
failures reported in https://github.com/saltstack/salt-jenkins/issues/326.
 2017-05-05 14:26:54 -06:00
rallytime
bb1917243e Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-05 10:11:11 -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
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
da811fe505 Skip the correct test for the matcher tests in Arch 
I mixed up the test that was actually failing for Arch. I originally
submitted #41074 to skip the test_salt_documentation test in the
shell matcher tests. This is the wrong test to skip.

I reverted the previous commit, and applied the skipTest to the
correct test that is failing on Arch, which is the
test_salt_documentation_arguments_not_assumed test.
 2017-05-04 14:45:58 -06:00
rallytime
b9d1ce9aed Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch" 
This reverts commit 9eb482d5c7.
 2017-05-04 14:45:38 -06: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
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
rallytime
9eb482d5c7 Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch 
This test is failing in Arch due to a bug in salt-testing. Skipping until
salt-testing can be upgraded. For more information, see
https://github.com/saltstack/salt-jenkins/issues/324.
 2017-05-04 11:26: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
bed524a731 Update test hash to be sha256 instead of md5 2017-05-02 16:20:06 -06:00
twangboy
c7d164423e Increase timeout of run_function 2017-05-02 16:01:06 -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
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
Erik Johnson
26d2f4a52a Do not automatically unmask services to start/restart/etc. them 2017-05-01 16:01:35 -05:00
Mike Place
f766c97e26 Merge pull request #40777 from terminalmage/issue39349 
Add git_pillar integration tests
 2017-05-01 13:51:19 -06:00
Mike Place
678595f869 Merge pull request #40944 from gtmanfred/cloud 
allow dynamic loading of cloud drivers
 2017-05-01 12:02:40 -06:00
Mike Place
9d12a614b7
Fix failing test 2017-05-01 11:50:39 -06:00
Erik Johnson
402be207b2 Skip Pygit2 tests until EPEL fixes pygit2/libgit2 version mismatch 
We can revert this commit once they get the updated pygit2 pushed to
EPEL stable.
 2017-04-28 13:25:02 -05:00
Daniel Wallace
3a26d5d42d add cloud to saltutil sync test 2017-04-28 09:12:05 -06:00
Pedro Algarvio
fc90c8ec06
Switch how IOLoop's are run on these tests 2017-04-28 13:36:45 +01:00
Pedro Algarvio
e6ee82e7be
The expected error message is different on py2 and py3 2017-04-28 13:36:45 +01:00
Pedro Algarvio
75c035f09f
Fix basic stats when the test daemons are not running 2017-04-28 13:36:45 +01:00
Pedro Algarvio
d65742c066
Delete attributes 2017-04-28 13:36:44 +01:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Pedro Algarvio
4b59c351e4
This branch no longer targets py 2.6 2017-04-28 13:33:37 +01:00
Pedro Algarvio
7b503e562b
Use setUpClass instead of __init__ 2017-04-28 13:33:37 +01:00
Pedro Algarvio
0ae04c01ef
Delete all attributes even strings, boolean, integers 2017-04-28 13:33:37 +01:00
Pedro Algarvio
a0da182e0c
Setup console logging 2017-04-28 13:33:37 +01:00
Pedro Algarvio
2c6725d96e
Tell python that we're done with this dictionary 2017-04-28 13:33:37 +01:00
Pedro Algarvio
9a3f6d1350
Properly handle non native strings under py2 and py3 2017-04-28 13:33:36 +01:00
Pedro Algarvio
5ed3d8d98c
Don't error out because of bad file descriptor errors 2017-04-28 13:33:36 +01:00
Pedro Algarvio
102d63e238
Use self.addCleanup instead 2017-04-28 13:33:36 +01:00
Pedro Algarvio
88627d312f
Write the generated configuration into a config file 2017-04-28 13:33:36 +01:00
Pedro Algarvio
ef3dbb10de
Lint fixes 2017-04-28 13:33:35 +01:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly. 2017-04-28 13:33:35 +01:00
Pedro Algarvio
80b80e5416
Fix cherrypy memory leakage 
* Clean its event/signal bus since our tests don't rely on those.
* No test class level dictionaries
 2017-04-28 13:33:35 +01:00
Pedro Algarvio
dfeb3da8dc
Minor cleanup changes 2017-04-28 13:33:34 +01:00
Pedro Algarvio
3bf84e2a4e
Rename classes in order not to be collected up by pytest 2017-04-28 13:33:34 +01:00
Pedro Algarvio
7480a8e5fb
Check status on setUp not on the module level @skipIf decorator 2017-04-28 13:33:34 +01:00
Pedro Algarvio
6eac0ee132
Call tearDown and not setUp 
@cachedout with this change, the FD's still attached code will always
fail, so, for now, that's just commented out.
When you wrote this, did tornado eventually cleaned these FD's?
 2017-04-28 13:33:34 +01:00
Pedro Algarvio
6364128ad3
Fix tornado test cases 2017-04-28 13:33:34 +01:00
Pedro Algarvio
701280ae18
Cleanup 2017-04-28 13:33:33 +01:00