Merge branch 'master-20180517-02-pytest.mark'

alphatwirl · Jun 4, 2018 · 7e46b21 · 7e46b21
2 parents 9309609 + 1b702f3
commit 7e46b21
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/tests/unit/roottree/test_BranchBuilder.py b/tests/unit/roottree/test_BranchBuilder.py
@@ -22,15 +22,10 @@
     from alphatwirl.roottree import BranchAddressManagerForVector
 
 ##__________________________________________________________________||
-pytestmark = pytest.mark.skipif(
-    has_no_ROOT or sys.version_info[0]!=2,
-    reason='has no ROOT or Python 3'
-)
-
-# if uncomment both, only the bottom is in effect
-# pytestmark = pytest.mark.skipif(has_no_ROOT, reason="has no ROOT")
-# pytestmark = pytest.mark.skipif(sys.version_info[0]!=2, reason="skip for Python 3")
-
+pytestmark = [
+    pytest.mark.skipif(has_no_ROOT, reason="has no ROOT"),
+    pytest.mark.skipif(sys.version_info[0]!=2, reason="skip for Python 3"),
+]
 
 ##__________________________________________________________________||
 class MockLeaf(object):