rallytime
93c11d827a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/engines/slack.py
- salt/minion.py
2017-08-17 09:30:50 -04:00
Erik Johnson
9d8486a894
Add test for custom YAML loader with unicode literal strings
2017-08-15 11:06:20 -05:00
Erik Johnson
a0118bcece
Remove bytestrings and use textwrap.dedent for readability
...
PyYAML works with and without bytestrings on PY3, and Python 3 can read
all of the test data as regular strings, so bytestrings are unnecessary
here.
This also adds use of textwrap.dedent to make the YAML easier to read,
so it can be indented away from the far left side of the line.
2017-08-15 11:05:48 -05:00
rallytime
ccf790a83f
Update all references for moved functions to use "files" util
...
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
2017-07-18 10:31:01 -06: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
