rallytime
201031fa8a
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/man/salt.7
- doc/ref/configuration/minion.rst
- salt/cloud/clouds/ec2.py
- salt/returners/highstate_return.py
- tests/support/gitfs.py
- tests/unit/loader/test_loader.py
2018-08-10 13:12:14 -04:00
rallytime
f72a3ac6be
Make grains integration test more robust
...
The `test_grains_append_val_already_present` test can be flaky, especially on
CentOS 7 when it gets bogged down. Let's give the test a little breathing room
by adding a sleep so the grains.append calls don't stack up too quickly.
2018-08-08 14:58:05 -04:00
rallytime
0a297e7319
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/grains/core.py
- salt/utils/__init__.py
2018-04-05 13:43:51 -04:00
twangboy
c179388b0e
Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase
...
Fix the tear down function to just set the grain to an empty list instead of
removing each individual item
2018-03-21 16:37:10 +00:00
Erik Johnson
9c86cd627a
[PY3] Add unicode_literals to high-priority modules/states
2018-01-24 10:33:58 -06:00
rallytime
4d96cc1068
Merge branch '2017.7' into 'develop'
...
No conflicts.
2017-07-03 09:28:18 -06:00
Erik Johnson
3071bb7a37
Add debug logging for grains tests
...
The assert doesn't tell us anything about the grain that is failing.
This adds some debug logging to make this easier to troubleshoot.
2017-06-30 15:39:48 -05:00
rallytime
57166fd892
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-05-24 15:30:44 -06:00
Dmitry Kuzmenko
4ed0f8ed4e
Fixed grains module test: Arch release is 'rolling', not an empty str.
2017-05-23 11:53:56 +03:00
Steve Groesz
715df9a911
Add test for new kernelversion grain
2017-04-19 17:46:00 -05:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration
2017-04-04 18:58:19 +01:00
rallytime
148df32604
Merge branch '2016.11' into 'develop'
...
No conflicts.
2017-03-15 14:52:07 -06:00
Pedro Algarvio
7dc6b64689
No need to call .keys() when iterating a dictionary
2017-03-06 14:42:31 +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
