Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
a730e092
Commit
a730e092
authored
8 years ago
by
Elliot Oram
Browse files
Options
Downloads
Patches
Plain Diff
Remove OS skipping in VesuvioCommands test
Refs #15783
parent
e9d78f2a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py
+0
-27
0 additions, 27 deletions
Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py
with
0 additions
and
27 deletions
Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py
+
0
−
27
View file @
a730e092
...
...
@@ -61,21 +61,6 @@ def _equal_within_tolerance(self, expected, actual, tolerance=0.05):
abs_difference
=
abs
(
expected
-
actual
)
self
.
assertTrue
(
abs_difference
<=
abs
(
tolerance_value
))
def
skip_due_to_os
():
"""
Skip tests on some operating systems
Currenty tests are only being run on windows and RHEL7
@return true if tests SHOULD be skipped
"""
dist
=
platform
.
linux_distribution
()
is_rhel7
=
((
'
Red Hat
'
in
dist
[
0
])
or
(
'
CentOS
'
in
dist
[
0
]))
and
(
dist
[
1
].
startswith
(
'
7
'
))
is_windows
=
(
platform
.
system
()
==
"
Windows
"
)
'''
if is_rhel7 or is_windows:
return False # Tests should not be skipped
else:
return True # Tests should be skipped
'''
return
False
#====================================================================================
class
FitSingleSpectrumNoBackgroundTest
(
stresstesting
.
MantidStressTest
):
...
...
@@ -87,9 +72,6 @@ class FitSingleSpectrumNoBackgroundTest(stresstesting.MantidStressTest):
runs
=
"
15039-15045
"
self
.
_fit_results
=
fit_tof
(
runs
,
flags
)
def
skipTests
(
self
):
return
skip_due_to_os
()
def
validate
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
_fit_results
,
tuple
))
self
.
assertEqual
(
4
,
len
(
self
.
_fit_results
))
...
...
@@ -140,9 +122,6 @@ class SingleSpectrumBackground(stresstesting.MantidStressTest):
runs
=
"
15039-15045
"
self
.
_fit_results
=
fit_tof
(
runs
,
flags
)
def
skipTests
(
self
):
return
skip_due_to_os
()
def
validate
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
_fit_results
,
tuple
))
self
.
assertEqual
(
4
,
len
(
self
.
_fit_results
))
...
...
@@ -198,9 +177,6 @@ class BankByBankForwardSpectraNoBackground(stresstesting.MantidStressTest):
runs
=
"
15039-15045
"
self
.
_fit_results
=
fit_tof
(
runs
,
flags
)
def
skipTests
(
self
):
return
skip_due_to_os
()
def
validate
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
_fit_results
,
tuple
))
self
.
assertEquals
(
4
,
len
(
self
.
_fit_results
))
...
...
@@ -253,9 +229,6 @@ class SpectraBySpectraForwardSpectraNoBackground(stresstesting.MantidStressTest)
runs
=
"
15039-15045
"
self
.
_fit_results
=
fit_tof
(
runs
,
flags
)
def
skipTests
(
self
):
return
skip_due_to_os
()
def
validate
(
self
):
self
.
assertTrue
(
isinstance
(
self
.
_fit_results
,
tuple
))
self
.
assertEquals
(
4
,
len
(
self
.
_fit_results
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment