... | ... |
@@ -2,7 +2,6 @@ import operator |
2 | 2 |
import pickle |
3 | 3 |
import random |
4 | 4 |
|
5 |
-import flaky |
|
6 | 5 |
import pytest |
7 | 6 |
|
8 | 7 |
from adaptive.learner import ( |
... | ... |
@@ -70,7 +69,6 @@ def f_for_pickle_datasaver(x): |
70 | 69 |
return dict(x=x, y=x) |
71 | 70 |
|
72 | 71 |
|
73 |
-@flaky.flaky(max_runs=3) |
|
74 | 72 |
@pytest.mark.parametrize( |
75 | 73 |
"learner_type, learner_kwargs, serializer", learners, |
76 | 74 |
) |
... | ... |
@@ -85,8 +83,6 @@ def test_serialization_for(learner_type, learner_kwargs, serializer): |
85 | 83 |
f = f_for_pickle # noqa: F811 |
86 | 84 |
|
87 | 85 |
learner = learner_type(f, **learner_kwargs) |
88 |
- if learner_type is Learner1D: |
|
89 |
- learner._recompute_losses_factor = 1 |
|
90 | 86 |
|
91 | 87 |
simple(learner, goal_1) |
92 | 88 |
learner_bytes = serializer.dumps(learner) |
... | ... |
@@ -102,12 +98,9 @@ def test_serialization_for(learner_type, learner_kwargs, serializer): |
102 | 98 |
assert learner_loaded.npoints == 10 |
103 | 99 |
assert loss == learner_loaded.loss() |
104 | 100 |
|
105 |
- if learner_type is not Learner2D: |
|
106 |
- # cannot test this for Learner2D because |
|
107 |
- # xfailing test_point_adding_order_is_irrelevant |
|
108 |
- assert asked == learner_loaded.ask(1) |
|
109 |
- # load again to undo the ask |
|
110 |
- learner_loaded = serializer.loads(learner_bytes) |
|
101 |
+ assert asked == learner_loaded.ask(1) |
|
102 |
+ # load again to undo the ask |
|
103 |
+ learner_loaded = serializer.loads(learner_bytes) |
|
111 | 104 |
|
112 | 105 |
simple(learner_loaded, goal_2) |
113 | 106 |
assert learner_loaded.npoints == 20 |