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
78,954 Commits 24 Branches 182 Tags 341 MiB
2fdbe6f856
Commit Graph

5297 Commits

Author SHA1 Message Date
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00
Joseph Hall
109cb62e76 Remove .p from test 2017-01-20 20:22:57 -07:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Nicole Thomas
1262fa8ef8 Merge pull request #38843 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-20 14:01:12 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
 2017-01-20 12:07:19 -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
Ch3LL
374dc1ab88 skip 2016.3.5 due to :doc: references 2017-01-19 16:14:22 -07:00
Eric Radman
9b5d28df0c Extend support for pillarenv_from_saltenv to master config 
`pillarenv_from_saltenv` is already an option for minion config, this
change enables this feature on the master.

If set to `true` salt will derive the pillar environment set on the
master:

$ salt-run pillar.show_pillar saltenv=radman
my_passphrase:
    XYZ

$ sudo salt-run pillar.show_pillar saltenv=radman2
my_passphrase:
    ABC
 2017-01-19 13:34:33 -05: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
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
Mircea Ulinic
9be7de2d4c regex_match filter and tests 2017-01-18 15:01:05 +00:00
Mircea Ulinic
a345e39c5a Test Jinja filters 2017-01-18 15:01:05 +00: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
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
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
Joseph Hall
fc24b24998 Add correct function name 2017-01-17 08:55:58 -07:00
Mike Place
8093f72e9d Merge pull request #38687 from eradman/vmware_provisioning 
Try to resolve guest IP if VMware Tools is not installed
 2017-01-16 19:17:35 -07:00
Mihai Dinca
cfa22b4716 Allow changing baseurl with pkg.mod_repo(zypper) 2017-01-16 17:04:24 +01:00
Eric Radman
755c8901ec Fix pylint errors C0326 and C0303 2017-01-16 02:29:48 -05:00
Joseph Hall
380abd3744 Add cachedir args to tests 2017-01-15 14:46:35 -07:00
Mike Place
67383b01e1 Merge pull request #38717 from rallytime/py3-test-fixes 
A couple of Python 3 compatibility fixes
 2017-01-14 22:44:28 -07:00
rallytime
4e1e45d640 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-13 14:45:36 -07:00
Alexandru Bleotu
27aec059e6 Added tests for modules.vsphere.disconnect 2017-01-13 12:10:21 +00:00
Alexandru Bleotu
4b11697d40 Added tests for modules.vsphere.get_service_instance_via_proxy 2017-01-13 12:10:20 +00:00
rallytime
6a14ddeaef [vsphere_test.py] Exception.message has been removed in Python 3 
Access the message from the Exception('exception message',) object.
 2017-01-12 15:21:56 -07:00
rallytime
29fec06671 [module_test.py] Don't rely on list ordering: assert items are in 
comment
 2017-01-12 14:19:31 -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
Mike Place
956602244d Merge pull request #36759 from msiebeneicher/improvement/fix_log_output_for_json_and_yaml 
Fix log output for `--output=yaml`
 2017-01-06 14:44:53 -07:00
Mike Place
43a209bd12 Remove unused imports for lint 2017-01-06 11:32:45 -07:00
rallytime
342a5ac0b8 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-06 10:31:51 -05: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
zwo-bot
9fadb13524 Fix #38558 - pillar.get with default= ...,merge=true influence subsequent calls of pillar.get (#38579) 
* added deepcopy of default if merge=True

* ticket 38558: add unit test, deepcopy() only if necessary

* add test for pillar.get() + default value
 2017-01-06 10:10:19 -05:00
Mike Place
6646a95c1e Merge pull request #38490 from eradman/cloud_config 
Change map and profile extends merge strategy to use recursive update
 2017-01-05 16:35:41 -07:00
Mike Place
e8c115f5d3 Move comment to top of class to avoid lint error 2017-01-05 13:14:52 -07:00
Mike Place
aa7ed5960f Merge pull request #38592 from alexbleotu/location_override_test_fixes-gh 
Location override test fixes gh
 2017-01-05 13:09:57 -07:00
rallytime
80acd51d6f Update __builtin__ mock for PY3: module was moved to "builtins" 2017-01-05 14:11:28 -05:00
Alexandru Bleotu
54e41b16a5 Updated config_test tests to use CONFIG_DIR and not /etc/salt 2017-01-05 17:31:40 +00:00
Alexandru Bleotu
0b848ec184 Fixed WinrepoTestCase.test_genrepo to load BASE_FILE_ROOTS_DIR from salt.syspaths 2017-01-05 17:31:33 +00: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
rallytime
c47f34f535 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/chocolatey.py
  - salt/modules/htpasswd.py
  - salt/modules/img.py
  - salt/modules/smartos_virt.py
  - salt/modules/virtualenv_mod.py
  - salt/modules/xapi.py
  - salt/modules/zypper.py
  - salt/state.py
 2017-01-04 15:34:41 -05:00
Eric Radman
3ec910cf34 Change map and profile extends merge strategy to use recursive update 
Previously only top-level data elements could be overridden in a map or
extended profile entry. This change adjusts map and profile evaluation
to use a recursive merge using salt.utils.dictupdate.update().

This is a break with compatibility, but in the common case a cloud
profile or map is not structured to truncate configuration but to add
further detail to the profile that it extends.

Update map docs with an example from VMware where we chan now change a
network parameter without having to repeat other device information such
as disk controllers.
 2017-01-04 14:11:53 -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
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
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05: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
James Payor
d905c0730e Fixes for the behaviour of rabbitmq list_* module functions (all return lists/dicts as appropriate now). Fix bug in plugin_is_enabled and add list_{available, enabled}_plugins. 2016-12-29 19:40:07 +11:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Mike Place
5536aec4b1 Merge pull request #38414 from sevagh/ini_manage 
Add strict flag to ini.options_present
 2016-12-28 12:25:25 -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
Sevag Hanssian
727194b2a0 Add strict flag to ini.options_present 2016-12-27 11:50:10 -05:00
Mike Place
34621930aa Merge pull request #38420 from rallytime/module-deprecations 
Removed various deprecation notices from salt/modules/* files
 2016-12-27 09:09:58 -07:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
0a27f941f7 Removed various deprecation notices from salt/modules/* files 
Added docs to the release notes for all of these changes.

The affected modules are:

- htpasswd
- img
- smartos_virt
- virt
- virtualenc_mod
- xapi
- zypper
 2016-12-22 11:57:26 -07: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
Thilo Schmalfuss
dba315c4b6
ext-pillar nodegroups works for all minions now. 2016-12-22 11:57:17 +01:00
Mike Place
12436efb54 Merge pull request #38354 from gmacon/pip-freeze-all 
Use --all when calling pip.py
 2016-12-20 13:40:20 -07:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
George Macon
dca24b270e Use --all when calling pip.py 
Fixes #38253.
 2016-12-20 11:48:00 -05:00
Mike Place
530f495955 Merge pull request #38073 from doublescoring/2016.11 
2016.11
 2016-12-20 07:51:10 -07:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist 
Remove support for client_acl and client_acl_blacklist
 2016-12-20 06:33:23 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist 
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
 2016-12-19 16:18:48 -07:00
rallytime
513058945c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
 2016-12-19 14:58:39 -07:00
Erik Johnson
79231a5d8a archive.extracted: don't try to cache local sources (#38285) 
* archive.extracted: don't try to cache local sources

This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.

* Update tests to reflect change in cache behavior

* Add mock return for /bin/tar

This fixes failing tests for Ubuntu 14
 2016-12-19 14:37:58 -07:00
rallytime
8f80916432 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
 2016-12-19 14:00:52 -07:00
Mike Place
86c53b8efd Merge pull request #38172 from rallytime/win-deprecations 
Remove support for deprecation options/functions in win* files
 2016-12-19 07:33:05 -07:00
Adam Mendlik
8bfcd5bcd5 Adjust alternatives test for updated error message 2016-12-18 10:04:24 -07:00
Mike Place
09d9cff992 Merge pull request #38288 from terminalmage/archive-extracted-local-source-2016.3 
archive.extracted: don't try to cache local sources (2016.3 branch)
 2016-12-18 06:07:10 -07:00
Mike Place
39eed71eca Merge pull request #38295 from porunov/develop 
Add path style requests and http protocol support to the s3 module
 2016-12-18 05:57:37 -07:00
rallytime
62978cb7a0 Don't check the doc/conf.py file for doc markup refs 2016-12-16 13:56:12 -07:00
Erik Johnson
845e3d0e75 Update tests to reflect change in cache behavior 2016-12-16 14:09:48 -06:00
rallytime
770e732d76 Add a unit test to search for new doc markup refs 2016-12-16 11:44:39 -07:00
Oleksandr Porunov
786cb5412e Change assertTrue to assertFalse in tests 2016-12-16 15:40:20 +02:00
Alexey Aksenov
42d3d26f28 [38073] Fix test assertion 2016-12-16 13:37:50 +03:00
Alexey Aksenov
9b37ead913 Fix broken os.write without string.encode 
Fixes #38048
 2016-12-16 13:33:59 +03:00
Oleksandr Porunov
0e7f35e7b8 Change s3 tests. Add additional checks into the s3 module 2016-12-16 10:29:09 +02:00
rallytime
05ec9f4b5b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/netapi/rest_cherrypy/app.py
 2016-12-15 20:47:35 -07:00
rallytime
a9f90b881a Remove suport for the "win_repo", "win_repo_mastercachefile", and "win_gitrepos" options 
The "winrepo_dir", "winrepo_cachefile", and "winrepo_remotes"  options should be used instead,
respectively.
 2016-12-15 13:14:47 -07:00
Alexey Aksenov
70c8db5489 Fix decoding of broken string from remote sources 
Fixes #38070
Suggest to replace incorrect UTF symbols with the special replacement character.
This would simplily interation with broken things in the real world.
https://docs.python.org/3/howto/unicode.html#the-unicode-type
 2016-12-15 14:33:33 +03:00
Mike Place
6c1ca9dae7 Merge pull request #38236 from gtmanfred/2016.11 
SELINUXTYPE should not be changed
 2016-12-15 03:37:06 -07:00
Daniel Wallace
d1b070c894 clean up selinux unit test 2016-12-14 11:33:00 -06:00
Arthur Wikström
23d69c4ffe Updated expected test results for mac_package 2016-12-14 14:11:49 +01:00
rallytime
fe1e24909e Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-12-13 11:29:16 -07:00
rallytime
6a327d1367 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-13 10:19:47 -07:00
Mike Place
8f5c6e5df9 Merge pull request #38180 from alexbleotu/vsphere_decorators-gh 
Vsphere decorators gh
 2016-12-13 00:43:51 -07:00
rallytime
bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors 
The 16.0.0 version of pyOpenSSL has an upstream error in it that
causes a stacktrace in our test suite. The upstream issue has
been fixed in pyOpenSSL in 16.1.0 and upwards, but 16.0.0 is still
available.

This fix skips the test when the specific error generated by the
upstream bug is encountered during the test.
 2016-12-12 14:21:41 -07:00
rallytime
29f45c192c Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/ec2.py
  - salt/modules/grains.py
 2016-12-12 11:23:57 -07:00
Alexandru Bleotu
ded7ff9adb Fixed pylint 2016-12-12 05:56:13 -05:00
Nicole Thomas
23c039347e Merge pull request #38182 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-09 14:25:47 -07:00
Mike Place
8355adc535 Merge pull request #38158 from cachedout/issue_38094 
Fix type problem in grains.filter_by
 2016-12-09 14:24:40 -07:00
rallytime
609f814454 Reset socket default timeout to None (fixes daemons_tests failures) 
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:50:48 -07: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
627242ab5d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - tests/unit/config/config_test.py
 2016-12-09 11:45:14 -07:00
Mike Place
e8196e23c2
Lint, remove set literal 2016-12-09 11:37:44 -07:00
Alexandru Bleotu
bef16be61d Removed unnecessary call to salt.modules.vsphere._get_proxy_target from test 2016-12-09 11:58:00 -05:00
Alexandru Bleotu
7b0f6df8d8 Fixed test with new get_cluster call 2016-12-09 11:55:20 -05:00
Alexandru Bleotu
38b3ebf434 Fix pylint errors in tests for utils.vmware.get_hosts 2016-12-09 11:53:27 -05:00
Alexandru Bleotu
0ea033d21d Added tests for utils.vmware.get_hosts 2016-12-09 10:04:24 -05:00
Alexandru Bleotu
a7f250b7a0 Added tests for modules.vsphere.test_vcenter_connection 2016-12-09 07:55:44 -05:00
Alexandru Bleotu
cd47cf754c Added tests for modules.vsphere.gets_service_instance_via_proxy decorator 2016-12-09 07:55:44 -05:00
Alexandru Bleotu
f94ead0ad3 Added tests for modules.vsphere.supports_proxies decorator 2016-12-09 07:55:43 -05:00
Alexandru Bleotu
c9e70743d3 Added tests for modules.vsphere._get_proxy_connection_details 2016-12-09 07:55:43 -05:00
Alexandru Bleotu
7edf6101c1 Added tests for modules.vsphere.get_proxy_type 2016-12-09 07:55:30 -05:00
Alexandru Bleotu
1f0bdf83e9 Updated authors of tests for modules.vsphere 2016-12-09 07:55:30 -05:00
Denys Havrysh
cd0154ee93 Master config includes may contain errors and be safely skipped 2016-12-08 15:58:44 +02:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
 2016-12-07 16:31:11 -07:00
rallytime
28b56ea3b4 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-07 13:14:28 -07:00
Nicole Thomas
86091db647 Skip daemon unit tests when running on Python 2.6 (#38134) 
When switching the daemon unit tests to using multiprocessing pipes,
this exposed a deep bug in Python 2.6. Let's skip these on 2.6.
 2016-12-07 13:09:19 -07:00
Mike Place
9f4ebb3c18
Fix type problem in grains.filter_by 
Closes #38094
 2016-12-07 11:25:19 -07:00
Nicole Thomas
ae754e1069 Mock config.option call return for iptables unit test (#38131) 
Refs #31662
 2016-12-07 11:19:46 -07:00
Mike Place
fd06bab673 Merge pull request #38043 from MTecknology/2016.11 
Debian networking fix
 2016-12-07 10:32:17 -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
342884018b Fix SaltKeyOptionParserTestCase test failures 2016-12-06 15:03:44 -07:00
rallytime
186e2d0d03 Don't allow libcloud mock module injection in unit/states/libcloud_dns_test.py either 2016-12-06 09:24:07 -07:00
rallytime
d513a60189 Do not allow libcloud to be injected as a mock value in the libcloud_dns_test 
Other tests rely on importing libcloud, which should
not be a mock value.
 2016-12-05 16:55:18 -07:00
Alexandru Bleotu
2f428ef38f Added tests for utils.vmware.get_datacenter 2016-12-05 10:38:11 -05:00
Alexandru Bleotu
e8a854f9ac Added tests for utils.vmware.get_datacenters 2016-12-05 10:37:48 -05:00
Mike Place
9dcfdeef6b Merge pull request #38059 from rallytime/daemons-test-fix 
Call exec_test for the Syndic daemon in tests.unit.daemons_test.py
 2016-12-03 21:18:41 -07:00
Michael Lustfield
82d2b89e0c Rolling back unit test. 
Sorry, I just don't have the time to learn all of this right now.
 2016-12-02 20:26:00 -06:00
Michael Lustfield
b3edbcfd05 Adding larger and more complete debian_ip unit test. 2016-12-02 18:59:27 -06:00
rallytime
eb372b27d8 Add missing "not" statement: The last syndic test should assertFalse() 2016-12-02 16:53:39 -07:00
rallytime
74a417e527 Update the mocked cloud configs to also include master configs 
The master configs are injected into the cloud configs, and we need
them here in order to get the `user` default for the parsers test.
 2016-12-02 15:38:53 -07:00
Michael Lustfield
b6b1adc091 Typo: missing closing parenthesis 2016-12-02 14:57:12 -06:00
rallytime
4e10f8e018 Call exec_test for the Syndic daemon in tests.unit.daemons_test.py 2016-12-02 13:08:41 -07:00
Mike Place
9cd42b9b3f Merge pull request #38039 from rallytime/fix-37939 
Check to see if a line is already commented before moving on
 2016-12-02 13:08:35 -07:00
Michael Lustfield
32a1374748 Corrects expected return value 
Tests were failing because _parse_interfaces is returning the correct data per mocked data. The assertion was expecting the iface line to have been stripped.
 2016-12-02 13:34:31 -06:00
rallytime
8fd53a4808 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/cloud/vsphere.rst
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/templates/rh_ip/network.jinja
  - salt/utils/parsers.py
  - tests/unit/daemons_test.py
 2016-12-02 12:18:18 -07:00
rallytime
1da7aacfbe Update unit tests to account for additional file.search call 
Also removed some mocks that were not needed anymore for the
calls to ``file.contains_regex_multiline`` because that function
is no longer called in the state file.
 2016-12-02 11:22:10 -07:00
Mike Place
03e0fd39d1 Merge pull request #37963 from terminalmage/tgt_type 
Deprecate expr_form argument in the LocalClient
 2016-12-02 02:45:16 -07:00
Mike Place
6724fe4871 Modify daemons test to use multiprocessing (#38034) 
* Modify daemons test to use multiprocessing

Without this approach, instantiating a master/minion from this test
would affect the parser tests down the line.

* Fix typo

* Fix copy/paste error

* Add missing attr
 2016-12-01 15:33:36 -07:00
Erik Johnson
94a16ada7b Replace usage of deprecated expr_form in tests 2016-12-01 16:21:49 -06:00
Mike Place
faf94a10a0 Merge pull request #38030 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-01 15:03:32 -07:00
Erik Johnson
ac2f4e3ab9 Update systemd module unit tests to reflect new masking behavior 2016-12-01 14:21:33 -06:00
rallytime
0eab0ee8a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/2016.11.0.rst
 2016-12-01 12:14:33 -07:00
Mike Place
6ffea40dee Merge pull request #37813 from twangboy/windows_perms 
Windows Perms for file.directory and file.managed
 2016-11-30 11:12:26 -07:00
Daniel Wallace
9caf0b406d use sleep from path for docker.sls_build 
sleep sometimes is found in /bin/sleep, like in ubuntu.  We should just
depend on the PATH variable being correct, and finding sleep, instead of
explicitly saying /usr/bin/sleep
 2016-11-30 10:17:30 -06:00
Mike Place
0af7bd527d Merge pull request #37989 from alexbleotu/schema_updates-gh 
Schema updates gh
 2016-11-30 09:06:49 -07:00
Mike Place
c8380cf2c9 Merge pull request #37953 from m03/another-set-of-aptpkg-tests 
Additional aptpkg module unit tests
 2016-11-30 09:02:21 -07:00
Mike Place
f89530a79c Merge pull request #37988 from alexbleotu/wait_for_task_invalid_argument-gh 
Wait for task invalid argument gh
 2016-11-30 07:31:29 -07:00
Mike Place
fa41fa06cb Remove whitespace for lint check 2016-11-30 07:30:12 -07:00
Nicole Thomas
2723188c6f Merge pull request #37956 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-29 13:52:38 -07:00
m03
8d5ce68b55 Address config.get in autoremove and upgrade 2016-11-29 12:48:02 -08:00
Mike Place
b341357942
Remove Joyent test 
Removed per https://github.com/saltstack/salt/pull/37756#issuecomment-263618695
 2016-11-29 09:54:46 -07:00
rallytime
4760455600 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/dockerng.py
  - tests/unit/modules/linux_acl_test.py
 2016-11-29 09:31:05 -07:00
m03
001d1b615f Additional aptpkg module unit tests 2016-11-29 08:18:08 -08:00
Mike Place
c25a306759 Merge pull request #37647 from americanexpress/cron-non-root 
Revising cron for OS agnostic support of cron when running non-root
 2016-11-29 07:33:48 -07:00
Alexandru Bleotu
80baf38ee6 Added tests for new serialization code 2016-11-29 08:01:41 -05:00
Alexandru Bleotu
07979897b6 Added tests for InvalidArgument fault handling in utils.vmware.wait_for_task 2016-11-29 05:23:07 -05:00
Mike Place
ea46639ce7 Merge pull request #37272 from vutny/fix-getting-default-logging-opts 
Get default logging level and log file from default opts dict
 2016-11-28 16:04:20 -07:00
Mike Place
9cab761320 Merge pull request #37909 from thusoy/invalid-timezone 
Throw error when setting invalid timezone
 2016-11-28 14:04:35 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
 2016-11-28 11:08:19 -07:00
Tarjei Husøy
316d581354 Throw error when setting invalid timezone 
Closes #37685.
 2016-11-28 09:21:52 -08:00
m03
2aeaf553c8 Add tests 2016-11-28 07:33:01 -08:00
Daniel Boughton
ddc238df36 Fixed augeas_test.py to match True v.s. None for test_change_in_test_mode 2016-11-27 08:40:05 -05:00
Alexandru Bleotu
39fe0b41b6 Added/updated tests for exception handling/get_root_folder change in utils.vmware.get_content 2016-11-24 05:53:51 -05:00
rallytime
3dfed6b841 Adjust linux_acl unit test argument ordering 2016-11-23 17:02:23 +00:00
twangboy
c11506333c Fix some lint, fix a test 2016-11-22 10:05:49 -07:00
Alexandru Bleotu
ed64348502 Added tests for exception handling in utils.vmware.is_connection_to_a_vcenter 2016-11-22 09:08:06 -05:00
Alexandru Bleotu
3497d2344e Added tests for exception handling in utils.vmware.get_service_instance 2016-11-22 09:08:06 -05:00
castor-morveer
6246a98cfa Boto apigateway optional stacktrace in response mapping (#37618) 
* adding optional response template parameters for normal and error cases

* making optional response templates affect checksum calculation in order to correctly determine if the service needs updating

* Remove trailing whitespace

* removing trailing whitespaces

* correcting invalid mock values in unit test code
 2016-11-21 14:47:52 -07:00
Alexandru Bleotu
102b2b2e98 Vmware disconnect gh (#37809) 
* Added utils.vmware.disconnect

- disconnects from a vCenter or ESXi host

* Added tests for salt.utils.vmware.disconnect
 2016-11-21 13:25:16 -07:00
Moe
40af1857be Add more aptpkg unit tests (#37793) 
* Add more aptpkg unit tests

* Add test_refresh_db
 2016-11-21 09:19:42 -07:00
Denys Havrysh
518a3dd7ee Add unit tests for Salt parsers processing logging options 2016-11-21 16:53:29 +02:00
Benjamin J Cane
27c532b34c Adding spacing for pylint 2016-11-18 16:26:54 -07:00
Benjamin J Cane
16222e1d05 Revising logic to account for cron.deny 2016-11-18 15:46:57 -07:00
rallytime
6479a22c1d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/napalm_network.py
 2016-11-18 07:50:16 -07:00
Benjamin J Cane
8c84fd2013 Merge remote-tracking branch 'salt-upstream/develop' into cron-non-root 2016-11-17 15:40:42 -07:00
rallytime
d5a7ef6ca8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-11-17 10:37:42 -07:00
Mike Place
3be9ab4cd0 Warn on AES test for systems with > 1 core (#37724) 
* Warn on AES test for systems with > 1 core

* Whitespace fix
 2016-11-16 09:44:33 -07:00
Mike Place
c8fb487590 Added space for lint check in in-line comment 2016-11-15 13:56:47 +13:00
Eric Radman
a42ca638ec joyent: Properly handle error if deployment fails 
Previous behavior if an invalid profile parameter was used:

TypeError: 'NoneType' object has no attribute '__getitem__'

New Behavior:

Error: There was a profile error: Failed to deploy VM

Also fix up some pylint complaints
 2016-11-14 18:44:07 -05:00
kevin
1865b13645 Fix 'present' option when used without 'key_type' 2016-11-14 12:16:51 -07:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-14 09:19:49 -07:00
m03
8cb794addb Add initial aptpkg unit tests 2016-11-13 09:10:37 -08:00
Benjamin J Cane
61afd6e69f Revising for PEP8 checks 2016-11-11 14:11:16 -07:00
Benjamin J Cane
cf7585c9ab Removing blank line for PEP compliance 2016-11-11 13:08:10 -07:00
Benjamin J Cane
e188e12bc9 Fixing merge conflict with latest from develop 2016-11-11 12:21:27 -07:00
Benjamin J Cane
405c3336aa Revising cron state & module for OS agnostic support of cron when running as non-rootSquashed commit of the following: 
commit d5003a44230f7bb6878057023726ba7135c9909c
Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
Date:   Fri Nov 11 10:22:21 2016 -0700

    Revising cron state & module for OS agnostic support of cron when running as non-root

    commit c9c20fc34670e1b371c505d8b7959ea00ae0a36e
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Thu Nov 10 15:47:04 2016 -0700

        Re-adding removed comment

    commit 4058bf3f609aeec11e0ff2a91191eba16556abf0
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Mon Nov 7 11:08:20 2016 -0700

        Adding user to error message and fixing key error if there is no updates

    commit 768e28e43585451a241979d048d5ac704f4f8f60
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 23:24:13 2016 -0700

        Added try/except on group identification and refactored success messaging

    commit d575189b17c1b75ef6d43b9ca821fb66aa142531
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 23:23:38 2016 -0700

        Added try/except on group identification and refactored success messaging

    commit 13a8207e5bc99044a3dfca4412e34ba9884d44a8
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 17:21:18 2016 -0700

        Resolving group permissions issues when managing non-root crontabs

    commit 89a7d1e04f21f1cbd93b83052cf47ba7a7225d72
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Nov 4 12:32:55 2016 -0700

        Adding unit tests for OS specific cron command string rules

    commit b2a00009fda987474c40cee3f2ed8affe5f07f5b
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Wed Nov 2 09:10:06 2016 -0700

        Fixing cron.file when running as non-root

    commit ba27b18b01f304e541af8b6c7107596f34651123
    Author: Benjamin J Cane <Benjamin.J.Cane@aexp.com>
    Date:   Fri Oct 28 10:58:03 2016 -0700

        Removed OS specific logic to always run crontab commands as owner of cron
 2016-11-11 10:36:48 -07:00
rallytime
b86e9270e7 Update "warn" to "warning" in verify_test 2016-11-11 09:05:44 -07:00