Skip to content

Commit

Permalink
Remove test skip
Browse files Browse the repository at this point in the history
Fixes #337
  • Loading branch information
peterfpeterson committed Sep 1, 2020
1 parent 37c72f5 commit 9902176
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
3 changes: 3 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
from pyrs.core.peak_profile_utility import get_parameter_dtype
from pyrs.peaks.peak_collection import PeakCollection

# set to True when running on build servers
ON_TRAVIS = (os.environ.get('TRAVIS', 'false').upper() == 'TRUE')


@pytest.fixture(scope='session')
def test_data_dir():
Expand Down
7 changes: 1 addition & 6 deletions tests/unit/test_peak_fit_engine.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import numpy as np
import os
from pyrs.peaks import FitEngineFactory as PeakFitEngineFactory # type: ignore
from pyrs.core.workspaces import HidraWorkspace
from pyrs.core.peak_profile_utility import pseudo_voigt, PeakShape, BackgroundFunction
from pyrs.core.peak_profile_utility import Gaussian, PseudoVoigt
import pytest
import os
from matplotlib import pyplot as plt
from collections import namedtuple
from pyrs.core import pyrscore
import sys
# set to True when running on build servers
ON_TRAVIS = (os.environ.get('TRAVIS', 'false').upper() == 'TRUE')


def generate_test_gaussian(vec_x, peak_center_list, peak_range_list, peak_height_list):
Expand Down Expand Up @@ -579,8 +576,6 @@ def test_3_gaussian_3_subruns(target_values):
' not {}'.format(fit_cost2_lp[2])


# pseudo-Voigt peak fitting only works on mantid versions with https://github.com/mantidproject/mantid/pull/27809
@pytest.mark.skipif(ON_TRAVIS and sys.version_info.major == 2, reason='Need mantid version > 4.2.20200128')
@pytest.mark.parametrize("setup_1_subrun", [{'peak_profile_type': 'PseudoVoigt', 'min_x': 75., 'max_x': 85.,
'num_x': 500, 'peak_center': [80.], 'peak_range': [10. * 0.25],
'peak_intensities':[100.]}], indirect=True)
Expand Down

0 comments on commit 9902176

Please sign in to comment.