|
23 | 23 | import base64
|
24 | 24 | import contextlib
|
25 | 25 | import io
|
| 26 | +import time |
26 | 27 | import os, unittest
|
27 | 28 | import pickle
|
28 | 29 | import random
|
|
45 | 46 | from dlg.data.drops.file import FileDROP
|
46 | 47 | from dlg.droputils import DROPWaiterCtx
|
47 | 48 | from dlg.exceptions import InvalidDropException
|
48 |
| -from dlg.apps.simple import SimpleBranch |
| 49 | +from dlg.apps.simple import Branch |
49 | 50 | from dlg.apps.simple import NullBarrierApp, SleepAndCopyApp
|
50 | 51 |
|
51 | 52 | try:
|
@@ -1168,7 +1169,7 @@ class BranchAppDropTestsBase(object):
|
1168 | 1169 | """Tests for the Branch class"""
|
1169 | 1170 |
|
1170 | 1171 | def _simple_branch_with_outputs(self, result, uids):
|
1171 |
| - a = SimpleBranch(uids[0], uids[0], result=result, func_name="test.test_drop.func1") |
| 1172 | + a = Branch(uids[0], uids[0], result=result, func_name="test.test_drop.func1") |
1172 | 1173 | b, c = (self.DataDropType(x, x) for x in uids[1:])
|
1173 | 1174 | a.addOutput(b)
|
1174 | 1175 | a.addOutput(c)
|
@@ -1231,7 +1232,7 @@ def _test_single_branch_graph(self, result, levels):
|
1231 | 1232 | [DROPStates.COMPLETED, DROPStates.SKIPPED],
|
1232 | 1233 | ):
|
1233 | 1234 | a.async_execute()
|
1234 |
| - |
| 1235 | + time.sleep(0.01) |
1235 | 1236 | # Depending on "result", the "true" branch will be run or skipped
|
1236 | 1237 | self._assert_drop_complete_or_skipped(last_true, result)
|
1237 | 1238 | self._assert_drop_complete_or_skipped(last_false, not result)
|
|
0 commit comments