Pedro Algarvio
|
e6ee82e7be
|
The expected error message is different on py2 and py3
|
2017-04-28 13:36:45 +01:00 |
|
Pedro Algarvio
|
abe608d739
|
Drop @patch usage
|
2017-04-28 13:36:42 +01:00 |
|
Pedro Algarvio
|
9b1e55aa85
|
Import the full module namespace to avoid import shadowing.
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
|
2017-03-28 19:02:47 +01: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 |
|
rallytime
|
b4366103a6
|
Merge branch '2016.11' into 'develop'
Conflicts:
- .pylintrc
- .testing.pylintrc
- salt/fileclient.py
- salt/minion.py
- salt/modules/docker.py
- salt/modules/win_iis.py
- salt/states/docker.py
- salt/states/file.py
- salt/utils/__init__.py
- tests/integration/modules/test_sysmod.py
|
2017-02-27 15:11:37 -07:00 |
|
Pedro Algarvio
|
15af4c9728
|
Test filenames conformity. Adjust for pytest.
|
2017-02-23 23:19:42 +00:00 |
|