Colton Myers
|
000de95974
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
|
2015-04-16 12:15:44 -06:00 |
|
Pedro Algarvio
|
0940548d58
|
The decorator looks for 2 binaries. We always want the first.
|
2015-04-10 00:26:15 +01:00 |
|
Justin Findlay
|
2dd34ab6db
|
restore explicit '-' in unit tests
|
2015-03-26 22:23:11 -06:00 |
|
Nicole Thomas
|
8ebf146b56
|
Revert "Python 3 compat fix for pylint"
|
2015-03-23 15:43:45 -06:00 |
|
rallytime
|
7bfa4ce70d
|
Disable unused-import for py 3 compatibility
|
2015-03-23 10:47:03 -06:00 |
|
rallytime
|
e5e287cbb4
|
Pythong 3 compat fix for pylint
|
2015-03-23 10:03:56 -06:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Erik Johnson
|
904f9b6c90
|
Fix archive tests
This fixes references to the badly-named legacy zip and unzip functions,
as well as skipping the unrar test when neither unrar and rar are
installed.
|
2015-01-13 21:07:23 -06:00 |
|
Colton Myers
|
3ce5eb2838
|
Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
|
2015-01-09 11:39:09 -07:00 |
|
Erik Johnson
|
ab23bf0332
|
Update archive tests to use python_shell=False
|
2015-01-08 13:51:47 -06:00 |
|
Thomas S Hatch
|
8e281dedcc
|
lint fix
|
2014-12-11 16:58:10 -07:00 |
|
Daniel Hobley
|
694adda563
|
Fixed unit tests for archive module
|
2014-12-11 22:46:36 +01:00 |
|
rallytime
|
db9ae406c3
|
Fix mocked calls in unit/modules/archive_test.py
This is due to the changes in #18621
|
2014-12-09 08:36:30 -07:00 |
|
Pedro Algarvio
|
4d7ca91424
|
Remove unnecessary :license: from file headers
|
2014-05-26 19:26:15 +01:00 |
|
Nicola Marangon
|
06f77852cb
|
new tests for unzip with options parameters
|
2014-01-28 09:41:45 +01:00 |
|
Pedro Algarvio
|
0ae1a15c61
|
PEP8 E302 and E303 blank lines fixes.
|
2013-11-27 12:11:45 +00:00 |
|
Pedro Algarvio
|
e18ba0758b
|
Don't include authorship in generated documentation, the Sphinx way.
|
2013-09-16 17:24:00 +01:00 |
|
Pedro Algarvio
|
2acd67bc59
|
Adapted unit.modules.archive_test to use salttesting.mock
|
2013-08-26 13:00:07 +00:00 |
|
Pedro Algarvio
|
fe1736bbcd
|
Fix the mocked test for archive.unrar.
|
2013-07-30 06:14:13 +01:00 |
|
Pedro Algarvio
|
189bc4e45e
|
Added mocked tests for salt.modules.archive.unrar()
|
2013-07-30 05:36:19 +01:00 |
|
Pedro Algarvio
|
16c4057c4f
|
Added mocked tests for salt.modules.archive.zip(). Excludes as a list
|
2013-07-30 05:01:39 +01:00 |
|
Pedro Algarvio
|
39d0006931
|
Added mocked tests for salt.modules.archive.unzip(). Excludes as a list
|
2013-07-30 05:00:58 +01:00 |
|
Pedro Algarvio
|
34b22afad9
|
Added mocked tests for salt.modules.archive.rar()
|
2013-07-30 04:59:28 +01:00 |
|
Pedro Algarvio
|
1a7b68b1a3
|
Added mocked tests for salt.modules.archive.unzip()
|
2013-07-30 04:52:31 +01:00 |
|
Pedro Algarvio
|
2f2047aa47
|
Added mocked tests for salt.modules.archive.zip()
|
2013-07-30 04:22:02 +01:00 |
|
Pedro Algarvio
|
a7c7cca94e
|
Test if an exception is raised if the required binary is not found.
|
2013-07-29 23:29:58 +01:00 |
|
Pedro Algarvio
|
14980b7497
|
Update the archive.tar mocked test to the new usage.
|
2013-07-29 06:57:27 +01:00 |
|
Pedro Algarvio
|
4855c9427c
|
Simplify our decorator code and make it reusable.
|
2013-07-28 22:55:27 +01:00 |
|
Pedro Algarvio
|
5d0af6268e
|
Mocked test for salt.modules.archive.gunzip()
|
2013-07-28 12:51:13 +01:00 |
|
Pedro Algarvio
|
99b8f2f70f
|
Mocked test for salt.modules.archive.gzip()
|
2013-07-28 12:50:05 +01:00 |
|
Pedro Algarvio
|
dcdb9bf686
|
Mocked test for salt.modules.archive.tar()
|
2013-07-27 19:24:49 +01:00 |
|