Chase Adams
f2d855bfbf
docs: fix typo in states/index.rst
2017-03-30 04:41:04 -07:00
Chase Adams
b9982e3884
docs: fix typo in states/index.rst
2017-03-30 04:29:31 -07:00
Nicole Thomas
d3633cf8a2
Merge pull request #40357 from sergeizv/check-has-win32
...
Check salt.utils.win_functions.HAS_WIN32 in salt.utils.get_user
2017-03-29 17:11:45 -06:00
Nicole Thomas
d30ccede14
Merge pull request #40325 from cxmcc/user-nologinit-option
...
Add 'nologinit' option for useradd module and user.present state.
2017-03-29 17:07:42 -06:00
Nicole Thomas
48986ca16f
Merge pull request #40393 from holmboe/saltssh-ubuntu1604-python2-docfix
...
Document how to install Python 2 on an Ubuntu 16.04 host with salt-ssh
2017-03-29 16:50:14 -06:00
Nicole Thomas
1a8a1a091c
Merge pull request #40398 from q1x/develop
...
Correction in zabbix usergroup docstring
2017-03-29 12:33:43 -06:00
Pedro Algarvio
dd2862c11c
Merge pull request #40378 from twangboy/fix_multiple_tests
...
Fix multiple tests
2017-03-29 18:24:32 +01:00
Raymond Kuiper
a679eee9c4
Corrected a small namingerror in the docstring
2017-03-29 18:44:06 +02:00
Nicole Thomas
d0182ac3ef
Merge pull request #40375 from terminalmage/pr-39838
...
Cleanup and resubmit of PR #39838 against develop branch
2017-03-29 10:34:43 -06:00
Nicole Thomas
1daf4c059a
Merge pull request #40380 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-29 10:34:16 -06:00
Henrik Holmboe
311f9c86ee
Document how to install Python 2 on an Ubuntu 16.04 host with salt-ssh
2017-03-29 17:47:03 +02:00
rallytime
4fbe9f18b8
Use "self.archive_tar_source" instead of undefined ARCHIVE_TAR_SOURCE global
2017-03-29 09:11:46 -06:00
rallytime
d61b9631c6
Update docker execution module unit tests for develop branch
...
This test module was updated for both the 2016.11 and develop
branches in different ways. This commits removes some of the
changes that were merged-forward from the 2016.11 branch and
restores the develop branch tests functionality.
2017-03-29 09:07:22 -06:00
twangboy
0cda242755
Fix some lint, Pedro's Changes
2017-03-28 23:40:29 +00:00
rallytime
52edbffc85
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/cache/all/index.rst
- doc/topics/cache/index.rst
- salt/cache/localfs.py
- salt/modules/boto_rds.py
- salt/roster/cloud.py
- salt/states/virtualenv_mod.py
- tests/integration/states/test_archive.py
- tests/unit/modules/test_dockermod.py
- tests/unit/states/dockerng_test.py
2017-03-28 17:09:30 -06:00
Nicole Thomas
d7d3d68035
Merge pull request #40362 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-28 16:50:31 -06:00
Nicole Thomas
2febd05896
Merge pull request #40372 from zer0def/pip-cache-fixes
...
Fixes related to cache directory argument changes in pip>=6.
2017-03-28 16:48:40 -06:00
twangboy
f4d03a2c26
Fix file, fopen, and master
2017-03-28 21:36:16 +00:00
Pedro Algarvio
9322630126
Merge pull request #40138 from s0undt3ch/features/py3
...
Fix unit tests mocking
2017-03-28 22:34:32 +01:00
Narendra Ingale
4ac73bb55c
Added test for issue 39191.
2017-03-28 14:55:05 -05:00
Xiuming Chen
e44471e232
Dashes -> Dots.
2017-03-28 12:40:32 -07:00
Xiuming Chen
6a30b15257
Making a note indicating no-log-init option does not work on certain platforms.
2017-03-28 12:24:00 -07:00
Nicole Thomas
e49693a7b1
Merge pull request #40367 from Ch3LL/bump_version_dev
...
[develop] Bump previous version to 2016.3.6
2017-03-28 12:51:19 -06:00
Nicole Thomas
6162698c87
Merge pull request #40369 from Ch3LL/bump_version_11
...
[2016.11] Bump previous version to 2016.3.6
2017-03-28 12:50:39 -06:00
Ch3LL
7597d96edb
[2016.11] Bump previous version to 2016.3.6
2017-03-28 12:39:45 -06:00
Ch3LL
474c62328b
Bump previous version to 2016.3.6
2017-03-28 12:37:13 -06:00
Pedro Algarvio
5df3054f47
Add minimal documentation about LoaderModuleMockMixin
2017-03-28 19:04:05 +01:00
Pedro Algarvio
7dc11df8ef
Update existing tests documentation.
2017-03-28 19:04:05 +01:00
Pedro Algarvio
5bfe64a121
Fix and adapt the salt-extend templates to the LoaderModuleMockMixin
2017-03-28 19:04:05 +01:00
Pedro Algarvio
9383142dcc
The LoaderModuleMixin is the right approach here.
...
This changes sys.modules instead of mock patching it effectively
changing it while running tests. This should not happen.
2017-03-28 19:04:05 +01:00
Pedro Algarvio
4c17fad6b6
No need to use tests.unit.ModuleTestCase. Proper Mocking.
2017-03-28 19:04:04 +01:00
Pedro Algarvio
090041d674
Allow patching sys.modules with mocked modules
2017-03-28 19:04:04 +01:00
Pedro Algarvio
6dcf7552a7
Py3 fixes. Tests are not destructive.
2017-03-28 19:04:04 +01:00
Pedro Algarvio
d62a05c512
Extend the list, not append a list to a list
2017-03-28 19:04:04 +01:00
Pedro Algarvio
e95b7e062c
Proper mocking. Fix tests expectations. Runs on non windows too.
2017-03-28 19:04:03 +01:00
Pedro Algarvio
2b8d26b811
The develop branch no longer targets python 2.6
2017-03-28 19:04:03 +01:00
Pedro Algarvio
845cbabe97
Code cleanup. Proper mocking.
2017-03-28 19:04:03 +01:00
Pedro Algarvio
b7867e8e39
hashlib needs bytes in py3
2017-03-28 19:04:03 +01:00
Pedro Algarvio
8560d8a6d3
Proper mocking. Tests are not destructive.
2017-03-28 19:04:03 +01:00
Pedro Algarvio
2dc9e1cfd0
Proper mocking. Py3 Compat.
2017-03-28 19:04:02 +01:00
Pedro Algarvio
4baabcfb1e
Proper mocking. Some additional mocking and fixes.
2017-03-28 19:04:02 +01:00
Pedro Algarvio
42b6c3a030
ctypes is not a windows specific module
2017-03-28 19:04:02 +01:00
Pedro Algarvio
5e8764ef78
Return lists in py2 and py3 instead of dict_keys() in py3
2017-03-28 19:04:02 +01:00
Pedro Algarvio
da5ee155d1
Proper mocking. If this fails @twangboy, let me known.
2017-03-28 19:04:02 +01:00
Pedro Algarvio
99bc71dc4e
Proper mocking.
2017-03-28 19:04:01 +01:00
Pedro Algarvio
14db38979c
Proper mocking. Py3 Compat.
2017-03-28 19:04:01 +01:00
Pedro Algarvio
5d79bdb642
Python 3 compat
2017-03-28 19:04:01 +01:00
Pedro Algarvio
d397763553
Adjust to the new LoaderModuleMockMixin usage
2017-03-28 19:03:59 +01:00
Pedro Algarvio
7c9460b719
Reduce complexity while still allowing multiple loader modules to be mocked
...
This also goes in par with the effort to reduce memory usage since we no
longer have any class attributes attached to the test classes.
2017-03-28 19:02:51 +01:00
Pedro Algarvio
608402359f
Proper mocking. Windows compat.
2017-03-28 19:02:51 +01:00
