From 848305b8d38ceb490655f049a7b49f618484a666 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 6 Feb 2018 13:27:01 -0500
Subject: [PATCH] Skip multipole-related tests if OPENMC_MULTIPOLE_LIBRARY is
 not set

---
 pytest.ini                                |  1 +
 tests/regression_tests/diff_tally/test.py |  4 ++++
 tests/regression_tests/multipole/test.py  | 11 ++++-------
 tests/unit_tests/test_data_multipole.py   |  7 +++++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index d960ba8d2..cdd367ea9 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,3 +2,4 @@
 python_files = test*.py
 python_classes = NoThanks
 filterwarnings = ignore::UserWarning
+addopts = -rs
diff --git a/tests/regression_tests/diff_tally/test.py b/tests/regression_tests/diff_tally/test.py
index bd6792414..de5423fd9 100644
--- a/tests/regression_tests/diff_tally/test.py
+++ b/tests/regression_tests/diff_tally/test.py
@@ -3,6 +3,7 @@ import os
 
 import pandas as pd
 import openmc
+import pytest
 
 from tests.testing_harness import PyAPITestHarness
 
@@ -112,6 +113,9 @@ class DiffTallyTestHarness(PyAPITestHarness):
         return df.to_csv(None, columns=cols, index=False, float_format='%.7e')
 
 
+@pytest.mark.skipif('OPENMC_MULTIPOLE_LIBRARY' not in os.environ,
+                    reason='OPENMC_MULTIPOLE_LIBRARY environment variable '
+                    'must be set')
 def test_diff_tally():
     harness = DiffTallyTestHarness('statepoint.3.h5')
     harness.main()
diff --git a/tests/regression_tests/multipole/test.py b/tests/regression_tests/multipole/test.py
index 82e6bb4cd..5c79d4d6b 100644
--- a/tests/regression_tests/multipole/test.py
+++ b/tests/regression_tests/multipole/test.py
@@ -2,6 +2,7 @@ import os
 
 import openmc
 import openmc.model
+import pytest
 
 from tests.testing_harness import TestHarness, PyAPITestHarness
 
@@ -66,13 +67,6 @@ def make_model():
 
 
 class MultipoleTestHarness(PyAPITestHarness):
-    def execute_test(self):
-        if not 'OPENMC_MULTIPOLE_LIBRARY' in os.environ:
-            raise RuntimeError("The 'OPENMC_MULTIPOLE_LIBRARY' environment "
-                 "variable must be specified for this test.")
-        else:
-            super().execute_test()
-
     def _get_results(self):
         outstr = super()._get_results()
         su = openmc.Summary('summary.h5')
@@ -80,6 +74,9 @@ class MultipoleTestHarness(PyAPITestHarness):
         return outstr
 
 
+@pytest.mark.skipif('OPENMC_MULTIPOLE_LIBRARY' not in os.environ,
+                    reason='OPENMC_MULTIPOLE_LIBRARY environment variable '
+                    'must be set')
 def test_multipole():
     model = make_model()
     harness = MultipoleTestHarness('statepoint.5.h5', model)
diff --git a/tests/unit_tests/test_data_multipole.py b/tests/unit_tests/test_data_multipole.py
index dc30677e8..4a4a9f0d2 100644
--- a/tests/unit_tests/test_data_multipole.py
+++ b/tests/unit_tests/test_data_multipole.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import os
 
 import numpy as np
@@ -7,6 +5,11 @@ import pytest
 import openmc.data
 
 
+pytestmark = pytest.mark.skipif(
+    'OPENMC_MULTIPOLE_LIBRARY' not in os.environ,
+    reason='OPENMC_MULTIPOLE_LIBRARY environment variable must be set')
+
+
 @pytest.fixture(scope='module')
 def u235():
     directory = os.environ['OPENMC_MULTIPOLE_LIBRARY']