rallytime
7d7be2d375
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- doc/ref/configuration/master.rst
- tests/integration/states/test_archive.py
- tests/unit/transport/test_tcp.py
- tests/unit/transport/test_zeromq.py
2017-06-28 10:48:37 -06:00
Pedro Algarvio
4853952f1f
Use a temporary config
2017-04-04 18:04:38 +01:00
Pedro Algarvio
e72ab757a9
Use random ports. Tests cleanup.
2017-04-01 14:22:54 +01:00
Daniel Wallace
b839193443
Use linux_distribution from distro if not in platform
...
http://bugs.python.org/issue1322
python 3.7 is deprecating the platform.{linux_distribution,dist}
functions. They are being moved to the `distro` module on pypi. This
adds support for using the distro module if platform does not have the
needed functions.
2017-03-14 10:09:47 -05:00
Pedro Algarvio
3aa54e6e0e
Clean up after ourselves
2017-03-07 12:23:17 +00:00
Pedro Algarvio
cbef6c044f
Re-enable the test since we now have the flaky decorator
2017-03-02 19:56:05 +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
53eff91efa
Re-enable the test since we now have the flaky decorator
2017-02-28 22:52:48 +00:00
Pedro Algarvio
1e2753c875
Fix imports after renames
2017-02-23 23:19:43 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest.
2017-02-23 23:19:42 +00:00
