Merge pull request #55 from spacether/bug/make_tests_skipable

Skips test_pinned_plate if it fails

tests/test_samples.py

@@ -84,20 +84,12 @@ def test_multihole(self, file_name='multihole.py'):
  self.example_tester(file_name)
 
  def test_pinned_plate(self, file_name='pinned-plate.py'):
- if (sys.platform == 'darwin' and sys.version_info.major == 3 and
- sys.version_info.minor >= 6):
- # skip if OS X and Python >= 3.6
- self.skipTest('skipped test because on OS X '
- 'this test does not converge and fails in ccx')
- if sys.platform in ['linux', 'linux2']:
- # skip if Ubuntu
- self.skipTest('skipped test because Ubuntu detected and ccx would '
- 'throw a segmentation fault on this test')
- if sys.platform in ['win32', 'win64']:
- # skip if Windows
- self.skipTest('skipped test because on Win32/64 '
- 'this test may not converge and may fail in ccx')
- self.example_tester(file_name)
+ try:
+ self.example_tester(file_name)
+ except Exception as ex:
+ # Ubuntu - this test throws a segmentation fault
+ # Mac/Win sometimes this test does not converge in ccx and fails
+ self.skipTest('skipped test because this test failed')
 
  def test_pipe_crush_elastic(self,
  file_name='pipe-crush-elastic.py'):