rallytime
6360ecd3b3
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cloud/clouds/scaleway.py
- salt/config/__init__.py
- salt/log/mixins.py
- salt/minion.py
- salt/modules/ps.py
- salt/utils/decorators/__init__.py
- salt/utils/schema.py
- tests/unit/modules/etcd_mod_test.py
- tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
rallytime
35b2076584
Pylint fixes
2016-03-15 14:55:35 -06:00
Pedro Algarvio
e7681f7c75
Try to overcome a failure to get cwd in Cent tests
2015-07-28 12:07:04 +01:00
Pedro Algarvio
f7e6f716e3
Make PEP-8 checker happier
2015-04-21 20:35:14 -06:00
Thomas S Hatch
b626149245
fix tests
2015-04-15 11:59:25 -06:00
Pedro Algarvio
8fa37d65eb
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Pedro Algarvio
1eeb02d93f
Add a missed with
2014-11-26 21:07:39 +00:00
Pedro Algarvio
9230f5b5ee
Switch open() for salt.utils.fopen()
2014-11-26 17:50:47 +00:00
Pedro Algarvio
4d7ca91424
Remove unnecessary ©️ and :license: from file headers
2014-05-26 19:26:15 +01:00
Pedro Algarvio
b8d45673d5
Adapt to expected output
2014-01-20 11:09:56 +00:00
Pedro Algarvio
05b2636cd5
Fix unit test expected results since we now exit with an error code.
2014-01-19 16:16:49 +00:00
Thomas S Hatch
bbd159f8a0
Not sure why we are removing a file from the source halfway in a
...
test, this should fix the failing test, @s0undt3ch, if this break
something I am not seeing please let me know
2013-10-16 12:17:59 -06:00
Pedro Algarvio
40d70fb13f
os.getcwd() might thrown an OSError if it was deleted or moved.
...
Let's not fail because of that.
2013-10-16 17:32:22 +01:00
Pedro Algarvio
e72b4a3492
Fix syslog logic checks for file://, tcp:// and udp://. Fixes #7754 .
2013-10-15 22:09:37 +01:00
Pedro Algarvio
e18ba0758b
Don't include authorship in generated documentation, the Sphinx way.
2013-09-16 17:24:00 +01:00
Pedro Algarvio
dfa110d5cc
Updated integration.shell.key test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
495f8f0440
Updated integration.shell.cp test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
663f54ef9f
Update copyright years of changed files. Added __main__ execution to tests/integration/states/pip.py.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
222be7b446
Make sure every test module is runnable by __main__.
...
* Double to single quotes
2013-06-28 00:12:56 +01:00
Pedro Algarvio
7c5a5d0bd3
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
2012-12-11 10:23:37 +00:00
Pedro Algarvio
c5fe83272f
Even more open() to salt.utils.fopen().
2012-11-18 18:57:10 +00:00
Pedro Algarvio
52b0c1ba8e
Adapt cherry-picked 2dd188fa18abff3193450472af2192206907b3ba to the new output shell switch.
2012-11-16 18:01:01 +00:00
Pedro Algarvio
ee32784bb4
Make the salt-cp shell test case work across multiple machines.
2012-11-16 18:00:51 +00:00
Pedro Algarvio
75f262c447
Fix ValueError on Py2.6 zero length field names are not supported
2012-09-05 12:11:16 +01:00
Pedro Algarvio
81ccd7c9a7
Remove un-used import.
2012-09-03 23:26:59 +01:00
Pedro Algarvio
e7a10cce98
Fix saltstack/salt#1948
...
* `SaltCPOptionParser` was not reading any configuration file. It should!
* Fixed the `salt-cp` test which was not testing anything, until now.
2012-09-03 23:24:08 +01:00
Pedro Algarvio
f5aad4f8e2
Cleanup the salt-cp(salt.cli.SaltCP) binary parser.
...
For this, the timeout mix-in and both the target and output parser group mix-ins were re-used. Way less code and logic to keep track of.
Added a simple test for this binary too.
2012-08-04 22:28:51 +01:00
