Skip to content

Commit 71e03cb

Browse files
Merge pull request #1163 from google:glados-verma-patch-1
PiperOrigin-RevId: 647863738
2 parents 865512a + f838833 commit 71e03cb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

openhtf/util/test.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,11 @@ class TestCase(unittest.TestCase):
660660

661661
def __init__(self, methodName=None):
662662
super(TestCase, self).__init__(methodName=methodName)
663-
test_method = getattr(self, methodName)
664-
if inspect.isgeneratorfunction(test_method):
665-
raise ValueError('%s yields without @openhtf.util.test.yields_phases' %
666-
methodName)
663+
if methodName != 'runTest':
664+
test_method = getattr(self, methodName)
665+
if inspect.isgeneratorfunction(test_method):
666+
raise ValueError('%s yields without @openhtf.util.test.yields_phases' %
667+
methodName)
667668

668669
def setUp(self):
669670
super(TestCase, self).setUp()

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ python =
1010
[testenv]
1111
deps = -r{toxinidir}/test_reqs.txt
1212
commands = {envbindir}/python setup.py build_proto
13-
{envbindir}/python setup.py test --pytest-cov=term-missing
13+
{envbindir}/python setup.py test --pytest-cov=term-missing,lcov
1414
# usedevelop causes tox to skip using .tox/dist/openhtf*.zip
1515
# Instead, it does 'python setup.py develop' which only adds openhtf/ to the
1616
# path.

0 commit comments

Comments
 (0)