diff --git a/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py b/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py index 3b5e1dbf120ec0aed0e8df5aa29dff890fa68b9e..bcda83fe05d09497d33f76e74c3058a595ba8a77 100644 --- a/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py +++ b/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py @@ -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))