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
75,661 Commits 24 Branches 182 Tags 341 MiB
30fe5641c7
Commit Graph

8641 Commits

Author SHA1 Message Date
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-20 11:53:00 -07:00
Mike Place
efe1bf10e8 Merge pull request #38832 from terminalmage/issue38711 
archive.extracted: Identify symlinks when checking for incorrect types
 2017-01-20 11:36:14 -07:00
rallytime
ce6d1b103d Make sure we're using the opts dict mocking in parsers_test 
The additional call to parser.parse_args(args) negates the first
patch to running self.config_func. We want the opts that we set
up in the above test to patch the setup args when the parse_args
func is called. This updates the mock to work with better with
patch and removes the additional parser.parse_args call.
 2017-01-20 10:20:51 -07:00
Erik Johnson
d10c068e25 Update archive state unit tests to reflect symlinks in archive.list 2017-01-20 08:49:40 -06:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
Mike Place
d14f0c64eb Merge pull request #38812 from rallytime/pyobjects-test 
Update pyobjects test to be a list
 2017-01-18 14:06:00 -07:00
Mike Place
23b8b47258 Merge pull request #38809 from twangboy/fix_hostname_2016.3 
Fix get_hostname to handle longer computer names
 2017-01-18 12:31:59 -07:00
rallytime
f3e84c1ab7 Update pyobjects test to be a list 
Refs the discussion in https://github.com/saltstack/salt/issues/21796#issuecomment-84454088
 2017-01-18 12:16:30 -07:00
twangboy
d57a51f9f9 Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
Mike Place
1033bbdde8 Merge pull request #38808 from vutny/fix-38388 
Fix #38388
 2017-01-18 11:19:35 -07:00
Megan Wilhite
a8a6215663 refine the os detection in archive test (#38807) 2017-01-18 11:03:55 -07:00
Denys Havrysh
9bd203ffcc Fix #38388 
If `log_level_logfile` is not set explicitly it should inherit the
level set by `log_level` configuration option.
 2017-01-18 19:16:38 +02:00
Mike Place
e0bf700020 Merge pull request #38790 from cachedout/fix_pyobjects_test_typo 
Fix typo in pyobjects test
 2017-01-18 08:38:56 -07:00
Mike Place
a66afb5f0f
Fix typo in pyobjects test 2017-01-17 13:57:20 -07:00
rallytime
64d866f7ab Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-17 11:44:26 -07:00
Mike Place
bab3479a3c Merge pull request #38585 from rallytime/follow-up-38527 
Follow up to PR #38527
 2017-01-17 11:40:01 -07:00
Mike Place
4e6146f65f Merge pull request #38660 from techhat/cachedir 
Don't force salt.cache to use cachedir from opts
 2017-01-17 11:38:34 -07:00
rallytime
05587201b6 Pylint fix: add line at end of file 2017-01-17 10:26:43 -07:00
Joseph Hall
be55b57abf One last fix 2017-01-17 10:07:25 -07:00
Joseph Hall
fc24b24998 Add correct function name 2017-01-17 08:55:58 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Joseph Hall
380abd3744 Add cachedir args to tests 2017-01-15 14:46:35 -07:00
rallytime
4e1e45d640 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-13 14:45:36 -07:00
rallytime
b910499dbe Various follow up fixes 
Merge branch '2015.8.12_follow_up' into '2015.8'
 2017-01-13 14:40:17 -07:00
rallytime
fa01367599 Keep a copy of the DEFAULT_API_OPTS and restore them after the test run 
Without this copy, the settings in DEFAULT_API_OPTS was getting overridden
by the new settings in the unit test. Let's copy those default settings,
and then restore them at the end of the test. These tests have also been
marked as destructive.
 2017-01-11 10:35:55 -07:00
rallytime
2ad07634d9 Test clean up 2017-01-10 11:35:48 -07:00
rallytime
fd2ee7db30 Add some simple unit tests for salt.config.api_config function 
This will help prevent regressions in this area as discussed in
PR #38527.
 2017-01-09 16:44:48 -07:00
Ch3LL
47f8b68e0b fix unit.modules.file_test 2017-01-09 15:01:52 -07:00
rallytime
7a668e9749 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
 2017-01-09 11:59:43 -07:00
rallytime
34282322c0 Clean up tests and docs for batch execution 
Batch execution was removed from NetapiClient and Saltnado in
previous commits. This change is a follow up that removes related
test cases and doc references.
 2017-01-09 11:29:34 -07:00
Jonathan Ballet
2c8845aaa0 add test for pillar.get() + default value 2017-01-06 10:20:13 -05:00
Jonathan Ballet
c2f98d2f04 ticket 38558: add unit test, deepcopy() only if necessary 2017-01-06 10:19:57 -05:00
Erik Johnson
3424a108ac Fix failing unit.states.boto_vpc_test.BotoVpcRouteTableTestCase.test_present_with_routes 2017-01-05 15:41:23 -06:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
 2017-01-04 16:54:58 -05:00
Mike Place
1895eb7533 Merge pull request #38529 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-04 10:06:56 -07:00
Mike Place
325dc56e59 Merge pull request #38554 from multani/fix/30454 
Fix YAML deserialization of unicode
 2017-01-04 08:31:16 -07:00
Megan Wilhite
1c951d152b fix gce image bug (#38542) 2017-01-04 09:08:04 -05:00
Jonathan Ballet
2e7f743371 yaml: support unicode serialization/deserialization 
Fix: #30454
 2017-01-04 13:29:28 +01:00
Jonathan Ballet
df76113c5c jinja: test the "yaml" filter with ordered dicts 2017-01-04 13:29:28 +01:00
Pablo Suárez Hernández
68d5475c1f Fixing Snapper unit tests for SUBVOLUME support 2017-01-04 08:59:51 +00:00
rallytime
85f470207c Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-03 10:13:06 -05:00
Daniel Wallace
048b9f6b9d add test 2016-12-29 17:08:24 -06:00
Mike Place
aa0c843553 Merge pull request #38461 from alprs/fix-kapacitor_changes 
Improvements/fixes to kapacitor task change detection
 2016-12-29 10:08:46 -07:00
Andreas Lutro
52721e97d6 clean up and fix tests 2016-12-29 11:14:24 +01:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Daniel Wallace
7b7c6b3878 file.line fail with mode=delete 
If the file is empty, it also fails, fix that.
 2016-12-28 11:51:45 -06:00
Mike Place
bbc149c67f Merge pull request #38342 from scthi/bugfix-ext-pillar-nodegroups 
Bugfix ext pillar nodegroups
 2016-12-22 09:47:42 -07:00