Pedro Algarvio
e8104167f4
Forced clean up of runtime config dictionary which includes a local client
2014-11-25 00:33:45 +00:00
Pedro Algarvio
0b946ba32b
Merge branch '2014.7' into hotfix/merge-forward
2014-11-22 02:17:10 +00:00
Pedro Algarvio
6e0f4da593
Fix syntax errors
2014-11-22 02:16:26 +00:00
Pedro Algarvio
50bb9c3867
Merge branch '2014.7' into hotfix/merge-forward
...
Conflicts:
salt/fileclient.py
2014-11-21 23:39:28 +00:00
Pedro Algarvio
74e23b9e26
And also the base branch of the incoming PR's branch
2014-11-21 23:35:37 +00:00
Pedro Algarvio
672e98cf0f
Use requests instead of github package. Also output the PR incoming branch.
2014-11-21 23:33:29 +00:00
Colton Myers
dc43840cee
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/glusterfs.py
salt/modules/macports.py
salt/modules/makeconf.py
salt/modules/mdadm.py
salt/modules/smartos_vmadm.py
salt/modules/zypper.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Thomas Jackson
44f91a1d21
Add regression test for #8670
...
Before the fix in #18363 get_event would return None on the first non-matching event (since wait was 0), this is to verify that get_event works properly with a wait of 0
2014-11-21 08:54:05 -08:00
Thomas Jackson
75bf7bd091
pylint fix
2014-11-20 18:35:41 -08:00
Thomas Jackson
0a1b88e6b5
Change all saltnado asserts to unittest asserts. This way when there is a failure you get nice pretty printouts!
2014-11-20 18:35:41 -08:00
Pedro Algarvio
7b4601219b
More import errors disables
2014-11-20 18:57:09 +00:00
Pedro Algarvio
0c50d789b7
The imports actually work so shut up PyLint!
2014-11-20 18:22:19 +00:00
Pedro Algarvio
21da23c070
Fix the class name
2014-11-20 17:35:42 +00:00
Pedro Algarvio
eb4bfbbde4
Remove slash
2014-11-20 17:19:58 +00:00
Pedro Algarvio
61de0bd629
Let's see if the slash makes a difference
2014-11-20 17:18:12 +00:00
Pedro Algarvio
5a3fead6de
Allow the tests to be properly skipped
2014-11-20 17:16:09 +00:00
Pedro Algarvio
10a9c479ff
Remove unused import
2014-11-20 16:45:36 +00:00
Pedro Algarvio
d651788dff
Allow the test cases to be properly skipped
2014-11-20 16:40:48 +00:00
Pedro Algarvio
76eb73b71e
Fix import
2014-11-20 16:40:48 +00:00
Pedro Algarvio
8ecd85edcc
Mock the right object
2014-11-20 16:40:48 +00:00
Pedro Algarvio
175cba7ff5
Fix imports
2014-11-20 16:40:47 +00:00
Pedro Algarvio
5cf320f45f
Allow the tests to be skipped
2014-11-20 16:40:47 +00:00
Pedro Algarvio
f37495c74f
Allow the test case to properly skip on missing tornado package
2014-11-20 16:40:47 +00:00
Pedro Algarvio
e45033b993
Make PyLint ignore unused imports
2014-11-20 16:40:47 +00:00
Pedro Algarvio
0e4f8de204
Use urlopen from six
2014-11-20 16:40:46 +00:00
Pedro Algarvio
13df58d2e6
Use urlopen and URLError from six
2014-11-20 16:40:45 +00:00
Pedro Algarvio
2bc6b735ef
Use urlencode from six
2014-11-20 16:40:45 +00:00
Pedro Algarvio
0937d2b4e1
Use urlencode from six
2014-11-20 16:40:45 +00:00
Pedro Algarvio
6b19c7b03e
Use urlencode from six
2014-11-20 16:40:45 +00:00
Pedro Algarvio
a802d8f7f5
Use the skip_if_binaries_missing_helper
2014-11-20 16:40:38 +00:00
Pedro Algarvio
66ea3afab8
Merge pull request #18326 from rallytime/pylinting
...
Fix missing cls variable and add some docstring info
2014-11-20 16:35:04 +00:00
rallytime
e70537eb2c
Fix missing cls variable and add some docstring info
2014-11-20 09:15:56 -07:00
Thomas Jackson
c68066d60b
Decrease timeout to fit into "long", before this timeout wasn't passed anywhere, but now that it is it has to fit into a C long otherwise you get errors like:
...
"OverflowError: Python int too large to convert to C long"
2014-11-20 07:46:13 -08: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
Mike Place
6b0e9c4e29
Provide nbopen poller default and increase interval in jenkins
2014-11-19 12:30:00 -07:00
Jonathan Ballet
a6c3499749
Please pylint
...
My patch #18221 yesterday introduced new Pylint warnings/errors.
This fixes these warnings.
2014-11-19 19:28:28 +01:00
Thomas S Hatch
873d1c1803
Merge pull request #18221 from multani/fix/git-config-set-shell-escape
...
Fix Git's config set with values containing white spaces.
2014-11-18 17:14:43 -07:00
Jonathan Ballet
97959959ca
Add future's absolute import to fix importation of git in tests
...
Tests in pillar.py are importing the "git" module, which is supposed to
be "GitPython", bt since Python 2.x doesn't use absolute import by
default, it imports the "git" submodule, which defines the tests for the
Git module of Salt, instead.
2014-11-18 22:46:35 +01:00
Colton Myers
716a7e3331
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/bsd_shadow.py
salt/modules/freebsdjail.py
salt/modules/yumpkg.py
salt/modules/zfs.py
salt/modules/zypper.py
salt/netapi/rest_tornado/saltnado.py
salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Jonathan Ballet
38bb70d398
Fix Git's config set with values containing white spaces.
...
The Salt function 'git.config_set' and the state 'git.config' (which relies
on the former) don't escape the value to be set in the configuration file
passed by Salt. For example, this doesn't work:
mylocalrepo:
git.config:
- name: user.name
- value: "Jonathan Ballet"
- repo: file://my/path/to/repo
This set the 'user.name' configuration value to "Jonathan" only.
(Additionally, the state discovers that the value set is not the one
specified, and keeps trying to set the right value, which ends up with lot
of "name = Jonathan" into the "[user]" section of Git's config file.)
This commit fixes the problem and adds some unit tests to verify it's
working properly.
2014-11-18 20:02:24 +01:00
Thomas Jackson
837a8ed475
Move EventListener over to ZMQStreams
2014-11-17 08:24:28 -08:00
Thomas Jackson
f7adfb44e9
Increase timeout from 5s to 10s, since jenkins seems to have issues calling runners in 5s
2014-11-14 18:08:44 -08:00
rallytime
652d4b4803
Fix up the linux_acl test that is failing
2014-11-14 15:40:12 -07:00
Thomas Jackson
ea8b4bb479
Make sure to only cleanup the tag_map in the case that you timeout the future
2014-11-14 11:47:35 -08:00
Thomas Jackson
e2102fcbc7
Pylint cleanup
2014-11-14 09:15:54 -08:00
Colton Myers
9a89057f83
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/transport/__init__.py
2014-11-13 12:40:24 -07:00
Thomas Jackson
6f0552c9e1
Pylint fixes
2014-11-13 09:33:14 -08:00
Thomas Jackson
9e61037b0d
Cleanup, and fix exp_form override-- we need to do it after the ping to minions
2014-11-13 08:36:28 -08:00
Thomas Jackson
ce22427071
Remove timeout test since that no longer valid
2014-11-13 08:36:28 -08:00
