Commit Graph

140 Commits

Author SHA1 Message Date
Matthew Williams
5dbba08c04 states.boto_vpc: sync vpc.present/absent and subnet.present/absent with execution module; add tests 2015-04-20 15:09:46 +00:00
Alexander Pyatkin
fdb62788de Do not parse state name with pip in editable mode 2015-03-24 16:09:38 +00:00
rallytime
12aa7e1ff6 Python 3 compat fix for states/archive_test.py 2015-03-23 15:45:40 -06:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
Colton Myers
18ab3f8275 Is it the underscore of doom? 2015-03-20 13:06:16 -06:00
Colton Myers
d89d8f5d2d Add the trailing slash 2015-03-20 11:55:45 -06:00
Colton Myers
4eee083691 Reorder mocked arguments 2015-03-20 10:36:25 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Justin Findlay
5f143ecb60 unit tests for states.archive.extracted tar opts
Implements tests for #20795.
2015-03-17 20:40:20 -06:00
Justin Findlay
53c9d48331 fix typo 2015-03-17 19:58:05 -06:00
Alexander Pyatkin
b23c0fa499 Make enhancements to htpasswd modules 2015-03-13 21:18:50 +00:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Mike Place
7a9428d9f5 Typo 2015-02-13 10:17:17 -07:00
Mike Place
37b375ba8b Use cls attr 2015-02-13 10:17:17 -07:00
Mike Place
b9fa5e4e29 Reset env at end of test 2015-02-13 10:17:17 -07:00
jfindlay
a1043ab87a Merge pull request #20605 from jfindlay/tar
fix tar check
2015-02-11 15:04:27 -07:00
Alexander Schwartz
7c6b8f1221 clean up lint messages 2015-02-11 19:57:14 +00:00
Thomas S Hatch
54de4cc592 Merge branch 'feature-20340-gem-sources' of https://github.com/RobertFach/salt into RobertFach-feature-20340-gem-sources 2015-02-10 09:51:22 -07:00
Alexander Schwartz
c05aae9ce7 added archive test script 2015-02-09 14:52:46 +00:00
Mike Place
7dd8aef5b4 Typo 2015-02-06 10:46:31 -07:00
Mike Place
5a90fcfd45 Use cls attr 2015-02-06 09:47:26 -07:00
Mike Place
8459819663 Reset env at end of test 2015-02-06 08:40:50 -07:00
Robert Fach
71d3e34342 implemented&tested gem state sources_add, sources_remove, added test cases 2015-02-04 17:27:35 +00:00
Pedro Algarvio
03763d65b4 Py3 compatibility fixes. Skip tests if no mock available. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
f13718f11c Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2'
Conflicts:
	salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
rallytime
cdc8039b58 Add some mocked variables to fix the file_test failures
Also do a little clean up of states/file.py and salt/state.py
2015-01-26 14:11:56 -07:00
Mike Place
f14eeaabc1 Fix more failing tests 2015-01-24 03:16:50 +00:00
Mike Place
05fed01430 Fix failing tests in develop 2014-12-19 11:05:47 -07:00
Thomas S Hatch
6a9195e190 fix bad file perms 2014-12-18 10:42:25 -07:00
Elias Probst
2fe5e0309c Typo (assertInSalStatetWarning → assertInSaltStateWarning). 2014-12-10 21:04:11 +01:00
Mike Place
b811f633af Fix one more failing test 2014-12-10 09:33:54 -07:00
Pedro Algarvio
bd7f23ac6f Switch open() for salt.utils.fopen() 2014-11-26 20:30:13 +00:00
starzyk1
4bdede0700 Fixes of pylint violations 2014-11-25 12:49:14 +01:00
starzyk1
50fab573c8 Fixes of pylint violations 2014-11-25 11:51:43 +01:00
Konrad Starzyk
6656837ff0 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-21 21:52:46 +01:00
Konrad Starzyk
99406c2215 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-20 11:20:41 +01:00
Sławek Ehlert
03f464c773 remove the leftovers from the previous file 2014-11-20 00:29:12 +01:00
Sławek Ehlert
e2e4bcf2ae fix output of subsequent calls for `environ.setenv` state
Previously ``setenv`` function (from ``modules.environ``) was
called even if the environment was already in a proper state.
This caused ``highstate`` to always report changes to be applied
even if they were not required.
2014-11-19 23:56:09 +01:00
Ash Berlin
b1e57b82ea Allow specifying custom gem to use in gem state and module
Better late than never - here is a PR for issue #13202
2014-11-09 01:06:08 +00:00
Chris Rebert
b9bb56841d fix numerous typos+misspellings 2014-11-05 13:57:47 -08:00
Konrad Starzyk
5b43246ab9 JBoss7 and Artifactory state/modules 2014-11-04 11:16:30 +01:00
Seth House
0d6e33a419 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-28 08:47:18 -05:00
rallytime
19d70dfac5 Added another test to module.run state unit tests 2014-10-24 15:28:03 -06:00
rallytime
f6490e9572 Add initial unit tests for module.run state function 2014-10-24 08:56:40 -06:00
rallytime
2b3d4b8e6b Import function in syslog_ng_test so tests will run 2014-09-14 08:04:20 -06:00
Thomas S Hatch
5d27e77c92 Merge branch 'feature/postgres_schema' of https://github.com/novapost/salt into novapost-feature/postgres_schema 2014-09-12 10:39:40 -06:00
Pedro Algarvio
da1fb62a67 Fix typo in comment 2014-09-11 18:18:39 +01:00
Rodolphe Quiédeville
b4dcc992c5 - salt/modules/postgres.py: add functions to manipulate schemas
- salt/states/postgres_schema.py: new states for schemas
- tests/unit/modules/postgres_test.py: add tests on new functions
- tests/unit/states/postgres_test.py: add tests on new functions
2014-09-11 12:17:18 +02:00