Skip to content

Commit d1c1c9a

Browse files
committed
Updated test
1 parent 1307960 commit d1c1c9a

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

tests/data/all_tests.list

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
tests/test_adt.py::test_blow_up[B1H-ContextCpu]
22
tests/test_adt.py::test_blow_up[B1H-ContextCpu:auto]
3-
tests/test_adt.py::test_blow_up[B1H-ContextPyopencl:0.0]
43
tests/test_adt.py::test_blow_up[B1V-ContextCpu]
54
tests/test_adt.py::test_blow_up[B1V-ContextCpu:auto]
6-
tests/test_adt.py::test_blow_up[B1V-ContextPyopencl:0.0]
75
tests/test_adt.py::test_blow_up[B2H-ContextCpu]
86
tests/test_adt.py::test_blow_up[B2H-ContextCpu:auto]
9-
tests/test_adt.py::test_blow_up[B2H-ContextPyopencl:0.0]
107
tests/test_adt.py::test_blow_up[B2V-ContextCpu]
118
tests/test_adt.py::test_blow_up[B2V-ContextCpu:auto]
12-
tests/test_adt.py::test_blow_up[B2V-ContextPyopencl:0.0]
139
tests/test_black_absorber.py::test_with_parallel_beam[ContextCpu]
1410
tests/test_black_absorber.py::test_with_parallel_beam[ContextCpu:auto]
1511
tests/test_black_absorber.py::test_with_generic_beam[ContextCpu-H]
@@ -133,10 +129,8 @@ tests/test_lossmap.py::test_run_lossmap[B2H_crystals-ContextCpu]
133129
tests/test_lossmap.py::test_run_lossmap[B2H_crystals-ContextCpu:auto]
134130
tests/test_rf_sweep.py::test_rf_sweep[DP pos-ContextCpu]
135131
tests/test_rf_sweep.py::test_rf_sweep[DP pos-ContextCpu:auto]
136-
tests/test_rf_sweep.py::test_rf_sweep[DP pos-ContextPyopencl:0.0]
137132
tests/test_rf_sweep.py::test_rf_sweep[DP neg-ContextCpu]
138133
tests/test_rf_sweep.py::test_rf_sweep[DP neg-ContextCpu:auto]
139-
tests/test_rf_sweep.py::test_rf_sweep[DP neg-ContextPyopencl:0.0]
140134
tests/test_transfer_line.py::test_transfer_line[ContextCpu]
141135
tests/test_transfer_line.py::test_transfer_line[ContextCpu:auto]
142136
tests/test_version.py::test_version

tests/data/assert_listing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ def pytest_collection_modifyitems(self, session, config, items):
3636
sys.exit("Please run data/store_all_tests.py as there are some new "
3737
+ "tests that are not logged yet:\n" + '\n'.join(only_current))
3838
if len(only_expected) > 0:
39-
sys.exit("The following tests were expected but not found:\n" + '\n'.join(only_expected))
39+
sys.exit("The following tests were expected but not found:\n" + '\n'.join(only_expected) + "Please run data/store_all_tests.py")

tests/test_initial_distribution.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ def test_create_initial_distribution(beam, npart,impact_parameter, pencil_spread
7070

7171
with flaky_assertions():
7272
# Pencil: left jaw
73-
pos_jawL_conv = coll_conv.jaw_L
73+
pos_jawL_conv = coll_conv.jaw_LU
7474
pos_partL_conv = part_conv.x[mask_conv_L].min()
7575
pencil_spread_convL = part_conv.x[mask_conv_L].max() - pos_partL_conv
7676
assert np.isclose(pencil_spread_convL, pencil_spread, atol=atol_spread)
7777
assert pos_partL_conv - impact_parameter - pos_jawL_conv < atol_cut
7878
assert pos_partL_conv - impact_parameter - pos_jawL_conv > 0
7979

8080
# Pencil: right jaw
81-
pos_jawR_conv = coll_conv.jaw_R
81+
pos_jawR_conv = coll_conv.jaw_RU
8282
pos_partR_conv = part_conv.x[mask_conv_R].max()
8383
pencil_spread_convR = pos_partR_conv - part_conv.x[mask_conv_R].min()
8484
assert np.isclose(pencil_spread_convR, pencil_spread, atol=atol_spread)
@@ -117,15 +117,15 @@ def test_create_initial_distribution(beam, npart,impact_parameter, pencil_spread
117117

118118
with flaky_assertions():
119119
# Pencil: left jaw
120-
pos_jawL_div = coll_div.jaw_L
120+
pos_jawL_div = coll_div.jaw_LD
121121
pos_partL_div = part_div.y[mask_div_L].min()
122122
pencil_spread_divL = part_div.y[mask_div_L].max() - pos_partL_div
123123
assert np.isclose(pencil_spread_divL, pencil_spread, atol=atol_spread)
124124
assert pos_partL_div - impact_parameter - pos_jawL_div < atol_cut
125125
assert pos_partL_div - impact_parameter - pos_jawL_div > 0
126126

127127
# Pencil: right jaw
128-
pos_jawR_div = coll_div.jaw_R
128+
pos_jawR_div = coll_div.jaw_RD
129129
pos_partR_div = part_div.y[mask_div_R].max()
130130
pencil_spread_divR = pos_partR_div - part_div.y[mask_div_R].min()
131131
assert np.isclose(pencil_spread_divR, pencil_spread, atol=atol_spread)

0 commit comments

Comments
 (0)