Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions mne/tests/test_coreg.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def make_dig(coords, cf):
assert_array_almost_equal(trans_est['trans'], trans['trans'])


@pytest.mark.timeout(90) # can take longer than 30 sec on Travis
@pytest.mark.slowtest # can take forever on OSX Travis
@testing.requires_testing_data
def test_scale_mri():
"""Test creating fsaverage and scaling it."""
Expand Down Expand Up @@ -129,8 +129,7 @@ def test_scale_mri():
assert ssrc[0]['dist'] is not None


@pytest.mark.slowtest
@pytest.mark.timeout(60) # >30 sec on Travis
@pytest.mark.slowtest # can take forever on OSX Travis
@testing.requires_testing_data
@requires_nibabel()
def test_scale_mri_xfm():
Expand Down