valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,464 Commits 24 Branches 182 Tags 341 MiB
098ed60d1b
Commit Graph

1218 Commits

Author SHA1 Message Date
rallytime
098ed60d1b Rework proxy minion test files to use new import styles 2017-05-24 10:23:57 -06:00
rallytime
616ac7289b Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/elasticsearch.py
  - tests/integration/__init__.py
 2017-05-23 10:36:41 -06:00
C. R. Oldham
6db31ce52a Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool and int. 
Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool
 2017-05-20 19:39:22 -06:00
rallytime
8e1db7c427 Pylint fix 2017-05-16 15:53:11 -06:00
rallytime
d23010a114 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/libcloud_dns.py
  - salt/states/pkg.py
  - tests/integration/modules/test_pkg.py
  - tests/unit/modules/test_mac_brew.py
  - tests/unit/modules/test_pkgutil.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/states/libcloud_dns_test.py
 2017-05-15 16:41:59 -06:00
Nicole Thomas
cbe6d00513 Merge pull request #41204 from twangboy/fix_pub_win 
Increase timeout for Windows
 2017-05-15 14:04:33 -06:00
Erik Johnson
7fe64219ae Add rtag check to integration test for pkg.refresh_db 2017-05-12 15:21:22 -05:00
twangboy
e9df95d2a0 Add timout in tests instead of publish 2017-05-12 11:32:04 -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
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
twangboy
e4c5156d77 Fix some lint 2017-05-04 16:45:58 -06:00
twangboy
75072b1c83 Fix pkg tests for windows 2017-05-04 15:13:41 -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
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
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
Daniel Wallace
3a26d5d42d add cloud to saltutil sync test 2017-04-28 09:12:05 -06:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly. 2017-04-28 13:33:35 +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
4062bd9fd9
Don't attempt connections at the module level! 2017-04-28 13:33:32 +01:00
rallytime
44623863fa Clean up integration test checks to be more encompassing 2017-04-24 15:12:20 -06:00
rallytime
3dc93be6f6 Skip test if no charmaps are found 
The "loacle -m" command might not return an error, but it might
just be empty. Let's not fail on a test that we're already logging
to the user.
 2017-04-24 12:38:49 -06:00
rallytime
7efebc9f78 Remove assertion against an empty string 
Returning an empty string is the expected behavior if the locale
is not set. This happens for example on the Fedora 24 test boxes.
 2017-04-24 12:19:06 -06:00
rallytime
e3550ab44c Skip gen_locale test if charmaps aren't available on the test machine 
The error of missing charmaps gets logged to the user. We shouldn't
be running the test for the gen_locale if we don't have charmaps
available on the test machine.
 2017-04-24 12:17:29 -06:00
rallytime
3898117d6e Update os_family grain to be "Suse" instead of "SUSE" for localemod 
Also update some of the test functions to be a little more clear
 2017-04-21 16:14:50 -06:00
Erik Johnson
7cef07b0d9 Remove legacy git_pillar tests 
Also remove git_pillar configuration from the test suite's master
configuration file.
 2017-04-20 03:51:08 -05:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-05 14:15:05 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Pedro Algarvio
7b713d9256
Use the more portable helper skip_if_not_root. 2017-04-04 18:58:21 +01:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests 2017-04-04 18:58:20 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
Pedro Algarvio
785698d2ce
Import for the original module 2017-04-04 18:04:38 +01:00
Pedro Algarvio
b94992f544
Some more RUNTIME_CONFIGS and RUNTIME_VARS fixes 2017-04-04 18:04:38 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins. 
The adapted config mixin get config methods are not static methods
 2017-04-04 17:29:34 +01:00
Mike Place
6056ee302a Merge pull request #40339 from s0undt3ch/features/py3-pt2 
[WIP] Move unit tests which were in integration tests - More py3 and mocking fixes
 2017-04-04 10:21:46 -06:00
Anthony Shaw
8c74d3df89 Update test_libcloud_dns.py 
add absolute imports
 2017-04-04 10:57:32 +10:00
rallytime
ede4c28887 Group checks for failhard setting in () in state.check_failhard function 
Fixes #38683

When two states combine the `require`, `failhard`, and `order` options,
the `order` option should be ignored because `require` is present. Then
the `failhard` option should make the state run fail.

The check for "failhard" in the `check_failhard` function in the state
compiler was too broad. We want "failhard" to be true AND tag to be in
the `running` dict. Without the parens around the first OR statement,
we were bypassing the AND requirement because failhard was found.

Since the second state's tag was not found in the running dict, the state
run stacktraces on a KeyError.
 2017-04-03 14:41:54 -06:00
Pedro Algarvio
9a11538b54
Stop using deprecated TestCase methods 2017-04-01 14:22:57 +01:00
Pedro Algarvio
fd6d031804
We now sync all on minion connect 2017-04-01 14:22:56 +01:00
Pedro Algarvio
104f7a71f2
Why do need the system grains here?! This is an expensive call. 2017-04-01 14:22:55 +01:00
Pedro Algarvio
d05028e88c
These are not integration tests 2017-04-01 14:22:51 +01:00
Anthony Shaw
7ae7b2574a
add utf8 header 2017-04-01 14:05:28 +11:00
Anthony Shaw
9db623ada2
py3 update and lint fixes 2017-04-01 10:14:29 +11:00
Anthony Shaw
c2681db9a4
commit fix and double check in integration test 2017-04-01 09:25:01 +11:00
Anthony Shaw
eb8ab0d75a
add tests to show broken functionlity reported in bug report 2017-04-01 09:21:25 +11:00
Pedro Algarvio
6dcf7552a7
Py3 fixes. Tests are not destructive. 2017-03-28 19:04:04 +01:00
Pedro Algarvio
6f79dd6af3
Not an integration test 2017-03-28 19:00:51 +01:00
Ch3LL
aae2a30eda add require_in for an entire sls test 2017-03-27 12:47:36 -06:00
Nicole Thomas
201846ff01 Merge pull request #40129 from terminalmage/py3-tests 
Python 3 compatibility fixes
 2017-03-17 17:49:26 -06:00