Merge branch 'dev' into issues/488

* dev: Work around py.test behavior change (#490)
quipucords · Nov 29, 2017 · 50b3d02 · 50b3d02
2 parents 6595d65 + 4aff173
commit 50b3d02
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/test/test_utilities.py b/test/test_utilities.py
@@ -167,6 +167,9 @@ def test_end_of_octet(self):
             '192.168.[0:1].[0:255]')
 
 
+# Have to skip these tests until pytest bug
+# https://github.com/pytest-dev/pytest/issues/2977 is fixed.
+@unittest.skip
 class TestSetupLogging(unittest.TestCase):
     def test_default_level(self):
         utilities.setup_logging(None)