Skip to content

Commit

Permalink
remove all tests from mac
Browse files Browse the repository at this point in the history
seems that tests in mac still failing so different from windows
  • Loading branch information
jcharkow committed Oct 1, 2024
1 parent 1c3dd8d commit 62a5c2d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions test/plotting/test_InteractiveThreeDimensionPlotter.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def test_plot_3d_vline(featureMap, snapshot_plotly):
fig = plotter.plot(featureMap)
assert snapshot_plotly == fig

@pytest.skipif(sys.platform == 'Darwin', reason="Plots slightly different on mac")
@pytest.mark.parametrize('include_ms1,include_ms2,smoothing_dict,type_of_comparison', [
# no smoothing
(True, True, dict(type='none'), 'retention time vs m/z'),
Expand All @@ -56,7 +57,7 @@ def test_plot_3d_vline(featureMap, snapshot_plotly):
(True, True, dict(type='none'), "ion mobility vs m/z")
])
def test_plot_individual_3d_surface(featureMap, include_ms1, include_ms2, smoothing_dict, type_of_comparison, snapshot_plotly):
if sys.platform in ['win32', 'Darwin'] and type_of_comparison == "ion mobility vs m/z": # ion mobility vs m/z leads to slightly different plot on windows and mac
if sys.platform == 'win32' and type_of_comparison == "ion mobility vs m/z": # ion mobility vs m/z leads to slightly different plot on windows and mac
pass
else:
config_dict = dict(include_ms1=include_ms1, include_ms2=include_ms2, smoothing_dict=smoothing_dict, type_of_comparison=type_of_comparison)
Expand All @@ -83,6 +84,7 @@ def test_plot_individual_3d_mesh_cube(featureMap, include_ms1, include_ms2, snap
assert snapshot_plotly == fig
'''

@pytest.skipif(sys.platform == 'Darwin', reason="Plots slightly different on mac")
@pytest.mark.parametrize('type_of_3d_plot,aggregate_mslevels,include_ms1,include_ms2,type_of_comparison', [
# Scatter not aggregated
('3D Scatter Plot', False, True, True, ''),
Expand All @@ -105,7 +107,7 @@ def test_plot_individual_3d_mesh_cube(featureMap, include_ms1, include_ms2, snap
('3D Line Plot', False, True, False, '')
])
def test_plot(featureMap, type_of_3d_plot, aggregate_mslevels, include_ms1, include_ms2, type_of_comparison, snapshot_plotly):
if sys.platform in ['win32','Darwin'] and type_of_comparison == "ion mobility vs m/z": # ion mobility vs m/z surface plot leads to slightly different plot on windows or mac
if sys.platform == 'win32' and type_of_comparison == "ion mobility vs m/z": # ion mobility vs m/z surface plot leads to slightly different plot on windows or mac
pass
else:
config_dict = dict(type_of_3d_plot=type_of_3d_plot, aggregate_mslevels=aggregate_mslevels, include_ms1=include_ms1, include_ms2=include_ms2, type_of_comparison=type_of_comparison)
Expand Down

0 comments on commit 62a5c2d

Please sign in to comment.