Commit Graph

25 Commits

Author SHA1 Message Date
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings
Well, all but one, which we expect to see
2018-05-31 15:28:25 -05:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files 2017-12-01 14:46:27 -05:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/reg.py
  - salt/modules/state.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_file.py
  - tests/integration/output/test_output.py
  - tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
rallytime
1bbe1abeb2
Allow --static option to display state runs with highstate output
Fixes #44556
2017-11-28 13:10:37 -05:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
Pedro Algarvio
bb60e5010c
Redundant 2017-03-01 01:33:08 +00:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
2017-02-28 22:52:49 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Pedro Algarvio
fc59d5e832 Python 3 Fixes (Pt. 2) (#39397)
* Typo in comment

* First convert to string if not already a string. Then to bytes under Py3.

The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.

* Mark tests which require root permissions to run

* Allow declaring that the function IS a class method.

```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
...     def bar(self):
...         print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```

On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.

* Always decode responses to the Python version native string implementation

* Just compare the objects as matching list.

Asserting same item count doesn't make that much sense.

* Py3 compatibility

* Fix saltnado tests under Py3

* Python 3 compatibility

* Show me the full traceback

* Revert "Convert fileserver data from bytes to strings"

This reverts commit e53972f8c6.

* Revert "Under Py3, we get `bytes` when using the roots backend directly"

This reverts commit 9f73b240c1.

* Convert from bytes to str if not a binary file

* Py3 compatibility fixes.

Convert file contents from bytes to string if not a binary file
2017-02-14 16:20:56 -07:00
msiebeneicher
9a1a23fca5 reverted json log changes 2016-11-04 11:09:45 +01:00
msiebeneicher
db19e31038 fixed integration tests after json output change 2016-10-12 16:05:29 +02:00
msiebeneicher
9e264812cb unify json output tests for different plattform / lib versions 2016-10-12 12:39:48 +02:00
Erik Johnson
5d40ffff01 Use a path that non-root users can write to for output file 2016-08-02 17:25:22 -05:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-06-15 15:41:00 -04:00
Mike Place
d3abc786cb Lint 2015-08-27 13:46:29 -06:00
Mike Place
7e00702863 Prefer a fresh copy of minion opts in yaml test
Avoids deprecation warning
2015-08-24 09:34:19 -06:00
Pedro Algarvio
62f868a076 Merge branch '2015.2' into develop 2015-02-27 10:02:47 +00:00
Pedro Algarvio
38ddbbc227 Fix imports 2015-02-26 09:41:22 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Mathieu Le Marec - Pasquet
7fe9a5e612 pep8 2014-10-12 12:16:07 +02:00
Mathieu Le Marec - Pasquet
a0aa6eee89 display traceback in test error 2014-10-12 11:37:28 +02:00
Mathieu Le Marec - Pasquet
43fce63b5c Another fix for outputter reliability 2014-10-11 18:37:35 +02:00
Pedro Algarvio
5d779444be No need to be root to run these tests 2014-05-12 19:09:55 +01:00
rallytime
8bf15e9062 Integration tests for checking outputter return data 2014-05-12 11:31:59 -06:00