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
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
Mike Place
737436a463 Merge pull request #37146 from cachedout/master_pub_error_reporting 
Master publish error reporting
 2016-11-11 22:52:31 +13:00
Mike Place
2c2dc93640
Fix test and check for jid not in pub_data 2016-11-11 15:37:47 +13:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07:00
Mike Place
403b469aea Merge pull request #37601 from eradman/random_org 
Skip random.org tests for any communication failure
 2016-11-11 10:52:25 +13:00
Eric Radman
671cebfa30 Skip random.org tests for any communication failure 
This test connects to random.org, which may throws the following error
on one network I manage:

ssl.SSLError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:590)

Other errors are possible, such as `socket.error`.  Since it is
difficult to anticipate the failure mode, skip these tests if https
communication provokes any exception.

Also, this is not a unit test--it's more of a system test. My
recommendation that we recategorize this as an integration test where
global IPv4 routing can more reasonably expected.
 2016-11-10 07:48:24 -05:00
Eric Radman
b19440418d Fixes to unit tests (#37586) 
Add skipIf pyvmomi is not installed

    NameError: global name 'vmodl' is not defined
    NameError: global name 'vim' is not defined

Fix skipIf typo for OpenBSD

    >>> import sys
    >>> sys.platform
    'openbsd6'

Avoid warning from glusterfs.py:

    Use specific 'len(elem)' or 'elem is not None' test

Enable boto_secgroup_test tests that work now:

    test skipped due to error in moto return - fixed in
    cc01669643
 2016-11-09 13:58:08 -07:00
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11' 
Conflicts:
  - salt/modules/file.py
 2016-11-09 12:56:58 -07:00
msiebeneicher
c787285955 fixed failing import 2016-11-09 13:39:24 +01:00
msiebeneicher
5428ed5d8c Merge branch 'develop' of https://github.com/saltstack/salt into improvement/fix_log_output_for_json_and_yaml 
* 'develop' of https://github.com/saltstack/salt: (72 commits)
  Remove known issues section for rc2 (#37569)
  Update release candidate docs with RC2 info (#37564)
  sqlite is not found in 2015.8 (#37549)
  Use 'driver' instead of 'provider' in test cloud configs (#37547)
  Added pillar_enc variable to orchestrate to be passed through
  Lint
  Cache tests
  Add unit tests for minion targeting
  Slight grammar fix
  Pylint fixes
  refresh_pillar() should be called always
  Improvements and bug fixes: - Ensure all keys in nested dicts under the data payload have dots replaced with underscores and store original key for reference - Replace use of config.option execution module which does not support ":" path syntax with salt.returners.get_returner_options() so config options are actually obtained - Fixed use of datetime module in date_index mode so functions are loaded properly
  Pylint fix for develop (#37513)
  Saltstack PPA is no longer maintained
  allow selection by id
  Update vmware.py
  handle other Solaris-like distributions that use pkgsrc the same as SmartOS
  Fix some lint
  Clean up docs
  Fix some syntax errors, string type checks
  ...
 2016-11-09 11:53:34 +01:00
Erik Johnson
2fc0b222bc Fix regression in service.dead state (#37562) 
* Fix regression in service.dead state when service is not available

This was originally broken in c4f899b.

* Add unit test for issue 37511
 2016-11-08 14:58:33 -07:00
Nicole Thomas
2e8e56ca69 [PY3] Change log.warn statements to log.warning (#37531) 
* [PY3] Change log.warn statements to log.warning

log.warn is deprecated in Python 3. This change removes the
occurance of deprecation warnings for using log.warn. For example:

```
17:24:23 [WARNING ] /testing/salt/utils/verify.py:522: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead
17:24:23   log.warn('Insecure logging configuration detected! Sensitive data may be logged.')
17:24:23
17:24:23 [WARNING ] Insecure logging configuration detected! Sensitive data may be logged.
```

* Tweak unit.utils.verify_test to using warning instead of warn
 2016-11-08 13:06:54 -07:00
rallytime
5ead1425d7 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/win_servermanager.py
 2016-11-08 13:04:33 -07:00
Nicole Thomas
453319b50a Don't pass the vpc id to boto.vpc.create_internet_gateway func (#37556) 
That function's namespace looks like this:
```
def create_internet_gateway(self, dry_run=False):
```
So when we pass in the vpc_id opbject in the test, the check later
in the function sets `dry_run=True` since the vpc_id opbject exists.

This later throws JSONResponseErrors because the `DryRun` flag is
set. This error raising functionality was added in the most recent
version of moto, which exposed this bug.

This fixes the three boto_vpc_test unit state tests. We'll see if
other tests need to be addressed in other files on a full test run.
 2016-11-08 12:48:26 -07:00
Mike Place
610a198322
Lint 2016-11-08 19:40:48 +13:00
Mike Place
3e848ad126
Cache tests 2016-11-08 18:49:10 +13:00
Mike Place
efef3948ad
Add unit tests for minion targeting 2016-11-08 16:27:36 +13:00
rallytime
2e68da3e52 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-11-07 08:22:17 -07:00
rallytime
eae3b9e30f Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-07 08:15:42 -07:00
rallytime
3b56f8bce1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/event/master_events.rst
 2016-11-07 08:13:57 -07:00
Mike Place
33d0789f6e Merge pull request #37348 from alexbleotu/create_cluster-gh 
Create cluster gh
 2016-11-06 15:02:41 +13:00
Mike Place
be93710fee Merge pull request #37452 from rallytime/fix-31135 
file.line with mode=replace on an empty file should return False, not stacktrace
 2016-11-06 14:55:11 +13:00
Mike Place
b678e7353d Merge pull request #37465 from lorengordon/jinja-filters 
Adds a couple handy jinja filters, `escape_regex` and `unique`
 2016-11-06 14:54:20 +13:00
Mike Place
9ce38fd4d6 Merge pull request #37466 from alexbleotu/test_rename-gh 
Renamed salt.utils.vmware.update_cluster tests
 2016-11-06 14:52:55 +13:00
Mike Place
9e4e936f4f Merge pull request #37473 from m03/fix-167-logrotate-state_2 
Fix #167 - Add logrotate state module
 2016-11-06 14:45:15 +13:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06:00
rallytime
ce4b82fdee Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/modules/status.py
  - salt/states/file.py
  - tests/unit/modules/status_test.py
 2016-11-04 13:51:46 -06:00
rallytime
4132929832 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-04 13:38:34 -06:00
m03
466efd3f55 Change test str to int for consistency 2016-11-04 09:43:02 -07:00
Erik Johnson
a3f38e5a9f Update file.extract_hash unit tests 
These tests now not only test the new functionality added for matching
on source URI and source_hash_name, but also test non-specific hash_type
lookups, specific hash_type lookups, and failed specific hash_type
lookups (i.e. requesting a hash type not present in the file).
 2016-11-04 11:25:54 -05:00
Pablo Suárez Hernández
4ae036055d Fix unit test for Zypper dist-upgrade in Carbon 2016-11-04 09:36:41 -06:00
Loren Gordon
20eb0bf347 Adds a set theory jinja filter unique 2016-11-04 10:14:24 -04:00
Alexandru Bleotu
b3404ae7a2 Renamed salt.utils.vmware.update_cluster tests 2016-11-04 09:57:23 -04:00
Loren Gordon
f1beaa0ef4 Adds a jinja filter regex_escape 
Fixes #37429
 2016-11-04 09:54:54 -04:00
Alexandru Bleotu
e126619405 Added tests for utils.vmware.create_cluster 2016-11-04 09:52:25 -04:00
msiebeneicher
1169cc3a11 reverted json log changes part2 2016-11-04 11:16:08 +01:00
msiebeneicher
9a1a23fca5 reverted json log changes 2016-11-04 11:09:45 +01:00
msiebeneicher
a742575b19 reintegrate develop branch 2016-11-04 11:07:17 +01:00
Mike Place
580eca709b Merge pull request #37121 from nevins-b/2016.3 
allow the file.recurse state to support saltenv
 2016-11-04 18:59:28 +13:00
Mike Place
898d28d2c9 Merge pull request #37237 from lyft/add-kinesis-support 
Add Amazon Kinesis support via boto3
 2016-11-04 18:30:43 +13:00
rallytime
94a00c66eb Write a unit test demonstrating stack trace in #31135 
Here is the stack trace that happens when running file.line with
mode=replace on a file that exists, but is empty, as described in
the bug report:

unit.modules.file_test.FileModuleTestCase.test_replace_line_in_empty_file  .................................................
   Traceback (most recent call last):
     File "/root/SaltStack/salt/tests/unit/modules/file_test.py", line 593, in test_replace_line_in_empty_file
       mode='replace'))
     File "/root/SaltStack/salt/salt/modules/file.py", line 1523, in line
       for line in body.split(os.linesep)])
   TypeError: expected a character buffer object
 2016-11-03 14:57:10 -06:00
msiebeneicher
a1949dac9e fixed json_out unit tests after latest change 2016-11-03 17:20:47 +01:00
rallytime
4080cb4f12 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-11-03 08:54:32 -06:00
Pablo Suárez Hernández
ffc596f215 Including resolver params for Zypper debug-solver 
Now '--no-allow-vendor-change' and '--from' parameters are included
into the zypper --debug-solver call before performing a dry-run dist-upgrade.
 2016-11-03 08:34:26 +00:00
Mike Place
60b5085696 Merge pull request #37315 from svenauhagen/feature/iptables 
iptables changes for match recent
 2016-11-03 13:16:49 +13:00
Mike Place
f00dc3e382 Remove trailing whitespace 2016-11-03 13:16:41 +13:00
Mike Place
51584c6ef5 Merge pull request #37405 from Tanoti/state_grains_exists 
Add state.grains.exists and unit tests
 2016-11-03 11:58:06 +13:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-02 11:33:21 -06:00
Aditya Kulkarni
e9b4620fac Add unit tests for cloning from snapshot (#37414) 2016-11-02 11:22:37 -06:00
Nicole Thomas
8679ce4510 Back-port #37321 to 2016.11 (#37409) 
* status.uptime - avoid nawks srand, causes problems on smartos

* status.uptime - remove docs comment that no longer applies

* status.uptime - optimize a tiny it and get rid of the need for a shell

* status.uptime - actually remove the now redudent line too

* status.uptime - readded fallback to uptime binary, atleast we get something on the BSDs too now

* status.uptime - support python pre 2.7 as per damon-atkins

* status.uptime - want OpenBSD support

* status.uptime - want freebsd support, removed fallback once again so we are consistant

* status.uptime - want NetBSD support

* status.uptime - fold @jfindlay  work for OSX into mine, tweak mine based on his work

* status.uptime - push tests from @jfindlay with updates SunOS test

* status.uptime - remove cmd.run_all as it was replaced by sysctl.get

* status.uptime - attempt to fix sunos test

* Figured out why there was a cmd.run mock  was there.

* add note for SunOS, so we do not forget

* Update version added tag
 2016-11-02 09:50:30 -06:00
Alexandru Bleotu
c68281b9fa Get cluster gh (#37310) 
* Added utils.vmware.get_cluster

- retrieves a cluster in datacenter based on its name

* Added tests for utils.vmware.get_cluster
 2016-11-02 08:28:41 -06:00
Tanoti
3293340679 Add state.grains.exists and unit tests 2016-11-02 11:32:05 +00:00
Erik Johnson
3014afd517 Overhaul archive.extracted state 
This fixes a number of annoyances with the archive.extracted state.
Rather than re-state the changes again here, they can be observed in the
carbon release notes, where they have been documented.
 2016-11-01 19:35:57 -05:00
rallytime
e082ff538b Fix failing test now that we're raising a CommandExecutionError 
Also adds a test to check that the CommandExecutionError is raised
when the filename is not present.
 2016-11-01 15:51:09 -06:00
rallytime
fd380c79b9 Add test case to reproduce dnsmasq.set_config failure in #34263 2016-11-01 14:31:14 -06:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-11-01 12:56:04 -06:00
Sven Auhagen
7c6ff77c98 Fix name_, for loop and add test cases 2016-11-01 19:32:49 +01:00
rallytime
da79271aed Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-01 10:43:07 -06:00
rallytime
b1d64448c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/utils/context.py
 2016-11-01 09:33:29 -06:00
Thomas S Hatch
1a4833b3a1 Merge pull request #37279 from gtmanfred/2016.3 
initialize super class of NamespacedDictWrapper
 2016-11-01 09:12:49 -06:00
Alexandru Bleotu
b0aaebaab8 Update cluster gh (#37347) 
* Added utils.vmware.update_cluster

- updates an existing cluster based on a configuration spec

* Added tests for utils.vmware.update_cluster
 2016-11-01 09:01:20 -06:00
Mike Place
d69142a3a7
Fix status test 
Correctly raise expected exception
 2016-11-01 12:06:20 +13:00
rallytime
ba5583938b Update mac_package unit tests: remove --no-compress flag 2016-10-31 16:13:48 -06:00
rallytime
e10058c831 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-31 10:15:25 -06:00
Mike Place
eaafb29ff2 Merge pull request #37321 from sjorge/carbons-status-uptime 
Carbons status uptime
 2016-11-01 00:29:17 +13:00
Mike Place
7d7941598e
Merge branch 'carbon' into carbon_develop 2016-10-31 23:57:16 +13:00
Mike Place
02d61e5928
Lint 2016-10-31 23:21:43 +13:00
Mike Place
3d36f47d53
Skip process test on < 2.7 
There is an unfixed bug in 2.6 that makes this unstable.
 2016-10-31 23:20:48 +13:00
Super-User
d73c748907 Figured out why there was a cmd.run mock was there. 2016-10-31 09:57:05 +01:00
Mike Place
a6b7417fe9
SIGILL -> SIGKILL in process test 
Fairly sure this was a typo. cc: @s0undt3ch
 2016-10-31 20:54:42 +13:00
Super-User
9d05c6aaaa status.uptime - attempt to fix sunos test 2016-10-31 08:31:19 +01:00
m03
4c6317fdc7 Better return data from logrotate module 2016-10-30 01:29:52 -07:00
Super-User
b12d19e339 status.uptime - push tests from @jfindlay with updates SunOS test 2016-10-30 00:17:48 +02:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
Eric Radman
f42480a1a9 Joyent: wait for node state to flip to 'ready' (#37305) 
When provisioning a SmartOS machine on Joyent using salt-cloud, the IP
is often set before SSH is fully configured. This can result in a
successful SFTP transfer, followed by a failure to run
salt-bootstrap.sh.
 2016-10-28 09:32:54 -06:00
Mike Place
36f47a4449
Reset dir for extend test 2016-10-28 15:02:13 +09:00
Alexandru Bleotu
a777d6eced Get managed object name gh (#37276) 
* Added get_managed_object_name to optimally retrieve a managed object's name

* Added tests for get_managed_obect_name
 2016-10-27 16:27:27 -06:00
Daniel Wallace
597f346d57 initialize super class of NamespacedDictWrapper 
Fixes #37264
 2016-10-27 14:28:01 -05:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
Mike Place
9f5cdf1d49 Merge pull request #37193 from cro/allow_host_from_scratch 
Allow VMs created from scratch to be assigned to a specific host
 2016-10-27 15:33:10 +09:00
Mike Place
85bef69ce4 Merge pull request #37248 from alexbleotu/get_properties_of_managed_object-gh 
Get properties of managed object gh
 2016-10-27 15:16:27 +09:00
Alexandru Bleotu
1a96f11269 Increased timeout to test_badload zeromq test 2016-10-26 08:04:42 -04:00
Alexandru Bleotu
c0b45afa54 Added tests for salt.utils.vmware.get_properties_of_managed_object 2016-10-26 06:37:32 -04:00
Mike Place
05079a206a
Merge branch 'carbon' into carbon_develop 2016-10-26 14:12:37 +09:00
Mike Place
fa20c4c128 Merge pull request #37223 from alexbleotu/get_service_instance_from_managed_object-gh 
Get service instance from managed object gh
 2016-10-26 10:35:02 +09:00
C. R. Oldham
6a7eab9e16 Remove this test, it is no longer illegal to leave out image 
and clonefrom parameters.  It is possible to create a VM from scratch.
 2016-10-25 15:23:32 -06:00
rallytime
a9da340759 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-25 10:40:15 -06:00
rallytime
bd58650af2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - tests/unit/netapi/rest_tornado/test_handlers.py
  - tests/utils/__init__.py
 2016-10-25 10:39:02 -06:00
Alexandru Bleotu
ac451002dd Added tests for get_service_instance_from_managed_object 2016-10-25 11:21:32 -04:00
Nevins Bartolomeo
99d2c360ed making messaging in tests match new return 2016-10-25 09:38:54 -04:00
Pablo Suárez Hernández
32f44b43ee Fix Zypper module and tests for Carbon 2016-10-25 11:08:00 +01:00
Mike Place
a6a24c2b3b
Workaround for tornado test startup error 2016-10-25 16:45:32 +09:00
Mike Place
88bcfa2c0a
Fix TCP test 2016-10-25 16:42:50 +09:00
Mike Place
0aab883180
Merge branch '2016.3' into 3_carbon 2016-10-25 16:13:44 +09:00
Mike Place
c4393d5e9e
Address transport test hang 
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
 2016-10-25 13:16:35 +09:00
Megan Kercher
f8e95a9813 finish present unit test, bugfix present ret 2016-10-24 15:11:11 -07:00
Megan Kercher
ce76611c35 get absent test working 2016-10-24 11:45:32 -07:00
Megan Kercher
b2e76a3cc0 edit comments, most of unit test: 2016-10-24 11:14:53 -07:00
rallytime
063ddfd7ce Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-24 10:16:17 -06:00
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186) 
Refs #37175
 2016-10-24 09:42:41 -06:00