twangboy
43dd7b325e
Merge Forward #52593
2019-07-02 18:28:03 -06:00
Daniel A. Wozniak
b99e914e05
Attempt to fix mine tests
2019-05-27 19:04:34 +01:00
Pedro Algarvio
fca981c909
One more known to return None
2019-05-27 19:02:43 +01:00
Pedro Algarvio
951df4882e
One more known to return None
2019-05-27 19:02:39 +01:00
Pedro Algarvio
eb5fd3ece2
Fix integration.modules.test_mine.MineTest.test_get
for sub_minion
...
Since the `sub_minion` does not have `mine_functions` defined,
`mine.update` returns `None` as opposed to `True` when `mine_functions`
are defined.
2019-05-27 19:02:33 +01:00
Pedro Algarvio
da2e147e54
Always cleanup the changed environ
2019-05-09 14:13:32 +01:00
Pedro Algarvio
62574ee197
Typo
2019-05-08 13:16:52 +01:00
Daniel A. Wozniak
522599d261
Dont fail just because some random process died
2019-05-08 13:16:47 +01:00
Pedro Algarvio
381f5fea52
Limit and reduce the ammount of log records sent over the wire
2019-05-08 13:16:44 +01:00
Pedro Algarvio
8948b690b1
Include COVERAGE_FILE
as an env variable.
...
This will tell coverage where to save all coverage files.
2019-05-08 13:16:44 +01:00
Pedro Algarvio
0af561ef24
Each generated script is now prepared for code coverage
2019-05-08 13:16:44 +01:00
Daniel A. Wozniak
8694db10d7
Fix windows tests
2019-05-08 13:16:42 +01:00
Daniel A. Wozniak
82e9ac5b8f
Avoid race condition in even assertions
2019-05-08 13:16:42 +01:00
Daniel A. Wozniak
9443451d9a
Revert part of 927219c
since it is not a fix
2019-05-08 13:16:42 +01:00
Daniel A. Wozniak
5fee7620a5
Fix timeout logic
2019-05-08 13:16:41 +01:00
Daniel A. Wozniak
517650f87b
check timeout when queue empty
2019-05-08 13:16:41 +01:00
Daniel A. Wozniak
7c0a9af3d0
fix linter
2019-05-08 13:16:41 +01:00
Daniel A. Wozniak
961dc40c9b
Ignore missing variable in six module
2019-05-08 13:16:41 +01:00
Daniel A. Wozniak
0f5a7f0abf
Fix typo
2019-05-08 13:16:41 +01:00
Daniel A. Wozniak
6c8c4182dd
Do not limit event assert to first event
2019-05-08 13:16:41 +01:00
Daniel A. Wozniak
304229240e
Wait longer for ping reaction
...
Wait longer for the ping reaction in case there are multiple events on
the bus and/or high load on the system running tests
2019-05-08 13:16:40 +01:00
Pedro Algarvio
51114aa4ed
Watch out for too long shebang's
2019-05-08 13:16:34 +01:00
Pedro Algarvio
c8de644cad
Fix lint issues under tests
2019-05-08 13:16:31 +01:00
Ch3LL
4945e35085
Fix pylint on 2017.7.9
2019-05-08 13:16:26 +01:00
Pedro Algarvio
036bf686c0
Rerun failed tests
2019-05-08 13:16:26 +01:00
Megan Wilhite
ecd6802b3f
Merge branch '2019.2.1' into cp-52415
2019-04-19 16:01:12 -04:00
Daniel A. Wozniak
c001022913
Fix linter
2019-04-19 16:22:52 +00:00
Daniel A. Wozniak
423f6f96b7
Fix vent assertion race condition
2019-04-19 16:16:01 +00:00
Erik Johnson
ceb3f4d91f
Add repack_state_returns to TestCase
...
This allows for a state return dict to be repacked so that the top level
keys are the IDs, making it much easier to analyze and craft asserts
against the results.
2019-04-18 10:57:15 -04:00
Erik Johnson
982e693ef6
Add exception logging in flaky decorator
2019-04-18 10:57:11 -04:00
Ch3LL
63962b547a
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- salt/states/linux_acl.py
- salt/transport/ipc.py
2019-03-28 11:10:45 -04:00
Gareth J. Greenaway
4908ed3048
Merge branch '2017.7' into merge-2018.3
2019-03-25 13:28:15 -07:00
Pedro Algarvio
981335a177
Revert "Avoid a traceback on tornado.testing test classes"
...
This reverts commit dce4ffab35
.
2019-03-20 14:09:45 +00:00
Pedro Algarvio
b039cec21a
Windows now has a static requirements file and no longer needs hacks
2019-03-20 14:02:51 +00:00
Pedro Algarvio
dce4ffab35
Avoid a traceback on tornado.testing test classes
...
https://gist.github.com/s0undt3ch/9298a69a3492404d89a832de9efb1e68
This only happens when XML reporting is enabled.
Why only now, I have no clue.
2019-03-18 15:39:10 +00:00
Ch3LL
9ada8d9b7f
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- salt/transport/zeromq.py
- tests/unit/modules/test_kubernetesmod.py
- tests/unit/modules/test_win_file.py
2019-03-14 16:13:54 -04:00
Ch3LL
9adc19eeb1
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/modules/zfs.py
2019-03-05 14:08:35 -05:00
Pedro Algarvio
0b4e68c2ba
Lint fixes
2019-03-05 17:10:57 +00:00
Pedro Algarvio
af4ae913d0
Lint fixes
2019-03-05 17:10:33 +00:00
Pedro Algarvio
ee4df3a43c
Lint fixes
2019-03-05 17:10:07 +00:00
Pedro Algarvio
257b3fc566
Windows needs special treatment
2019-03-05 16:42:03 +00:00
Pedro Algarvio
33955c9ed1
Windows needs special treatment
2019-03-05 16:39:15 +00:00
Pedro Algarvio
56f841f091
Windows needs special treatment
2019-03-05 16:34:07 +00:00
Daniel Wozniak
6da495fd29
Fix linter
2019-02-27 11:36:37 -07:00
Daniel A. Wozniak
f78b360c0a
fix reactor ping test
2019-02-26 15:49:20 -06:00
Daniel A. Wozniak
8697ce703e
Disable pylint checks, only for 2017.7
2019-02-11 17:28:37 -07:00
Daniel A. Wozniak
e5972f5a03
Use the code directory instead of cwd for python path
2019-02-11 17:15:16 -07:00
Daniel A. Wozniak
cbac390a7d
Use the code directory instead of cwd for python path
2019-02-11 17:13:07 -07:00
Daniel A. Wozniak
dbf4356aac
Use the code directory instead of cwd for python path
2019-02-11 14:47:19 -07:00
Daniel A. Wozniak
e49ba862cf
Add testing path to run_script commands
2019-02-11 14:13:25 -07:00