Skip to content

Commit 9280bfb

Browse files
author
Cody D'Ambrosio
committed
fix unittests
1 parent 80ed66a commit 9280bfb

2 files changed

Lines changed: 28 additions & 8 deletions

File tree

tests/test_line.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
from tap.directive import Directive
44
from tap.line import Line, Result
55

6+
try:
7+
import yaml
8+
from more_itertools import peekable # noqa
9+
10+
have_yaml = True
11+
except ImportError:
12+
have_yaml = False
13+
614

715
class TestLine(unittest.TestCase):
816
"""Tests for tap.line.Line"""
@@ -41,11 +49,13 @@ def test_str_diagnostics(self):
4149
result = Result(False, 45, "failing", diagnostics="# more info")
4250
self.assertEqual("not ok 45 failing\n# more info", str(result))
4351

44-
@unittest.mock.patch("tap.line.LOAD_YAML", True)
4552
def test_yaml_block(self):
4653
raw_yaml_block = """\
4754
message: test_message
4855
severity: fail
4956
"""
5057
result = Result(False, 46, "passing", None, None, raw_yaml_block=raw_yaml_block)
51-
self.assertEqual(result.yaml_block["message"], "test_message")
58+
if have_yaml:
59+
self.assertEqual(result.yaml_block["message"], "test_message")
60+
else:
61+
self.assertIsNone(result.yaml_block)

tests/test_tracker.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
from tap.tests import TestCase
88
from tap.tracker import Tracker
99

10+
try:
11+
import yaml
12+
from more_itertools import peekable # noqa
13+
14+
have_yaml = True
15+
except ImportError:
16+
have_yaml = False
17+
1018

1119
class TestTracker(TestCase):
1220
def _make_header(self, test_case):
@@ -295,8 +303,6 @@ def test_adds_not_ok_with_diagnostics(self):
295303
line = tracker._test_cases["FakeTestCase"][0]
296304
self.assertEqual("# more info\n", line.diagnostics)
297305

298-
@mock.patch("tap.tracker.ENABLE_VERSION_13", True)
299-
@mock.patch("tap.line.LOAD_YAML", True)
300306
def test_adds_ok_with_yaml_block(self):
301307
tracker = Tracker()
302308
tracker.add_ok(
@@ -308,10 +314,11 @@ def test_adds_ok_with_yaml_block(self):
308314
""",
309315
)
310316
line = tracker._test_cases["FakeTestCase"][0]
311-
self.assertEqual("test_message", line.yaml_block["message"])
317+
if have_yaml:
318+
self.assertEqual("test_message", line.yaml_block["message"])
319+
else:
320+
self.assertIsNone(line.yaml_block)
312321

313-
@mock.patch("tap.tracker.ENABLE_VERSION_13", True)
314-
@mock.patch("tap.line.LOAD_YAML", True)
315322
def test_adds_not_ok_with_yaml_block(self):
316323
tracker = Tracker()
317324
tracker.add_not_ok(
@@ -323,7 +330,10 @@ def test_adds_not_ok_with_yaml_block(self):
323330
""",
324331
)
325332
line = tracker._test_cases["FakeTestCase"][0]
326-
self.assertEqual("test_message", line.yaml_block["message"])
333+
if have_yaml:
334+
self.assertEqual("test_message", line.yaml_block["message"])
335+
else:
336+
self.assertIsNone(line.yaml_block)
327337

328338
def test_header_displayed_by_default(self):
329339
tracker = Tracker()

0 commit comments

Comments
 (0)