Commit 596a36b
committed
Fix CI test failures introduced by resources branch
- salt/states/saltutil.py: add sync_resources() state function to match
the sync_resources() module function added in saltutil.py; the existing
test enforces a 1:1 correspondence between all sync_* module and state
functions
- tests/pytests/unit/client/test_netapi.py: update test_run_log to use
AsyncMock for process_manager.run(), which our netapi.py change wrapped
in asyncio.run() and therefore requires a coroutine, not a plain Mock1 parent ddd8c4c commit 596a36b
2 files changed
Lines changed: 16 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
323 | 323 | | |
324 | 324 | | |
325 | 325 | | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
326 | 340 | | |
327 | 341 | | |
328 | 342 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
0 commit comments