Suppress tests output

This commit is contained in:
Dmitry
2019-02-19 13:03:37 -08:00
parent c1cdf77414
commit fecaa5a0a2
5 changed files with 52 additions and 22 deletions
+1
View File
@@ -20,6 +20,7 @@ else:
cmd = (
"nosetests -v --processes=-1 --process-timeout=500 --cover-inclusive "
"--cover-erase --cover-package=dvc --with-coverage --with-flaky "
"--logging-clear-handlers "
"{scope} ".format(scope=scope)
)
check_call(cmd, shell=True)
+11 -9
View File
@@ -11,6 +11,7 @@ import copy
from dvc.state import State
from mock import patch
from tests.utils.logger import MockLoggerHandlers
import dvc.logger as logger
from dvc.utils.compat import str
@@ -637,15 +638,16 @@ class TestWarnOnOutdatedStage(TestDvc):
with open(stage_file_path, "w") as stage_file:
yaml.dump(content, stage_file)
logger.logger.handlers[0].stream = StringIO()
self.main(["status", "-c"])
self.assertIn(
"Warning: Output 'bar'(Stage: 'bar.dvc') is "
"missing version info. Cache for it will not be "
"collected. Use dvc repro to get your pipeline up to "
"date.",
logger.logger.handlers[0].stream.getvalue(),
)
with MockLoggerHandlers(logger.logger):
logger.logger.handlers[0].stream = StringIO()
self.main(["status", "-c"])
self.assertIn(
"Warning: Output 'bar'(Stage: 'bar.dvc') is "
"missing version info. Cache for it will not be "
"collected. Use dvc repro to get your pipeline up to "
"date.",
logger.logger.handlers[0].stream.getvalue(),
)
def test(self):
self.color_patch.start()
+16 -13
View File
@@ -10,6 +10,8 @@ from dvc.main import main
from mock import patch, mock_open, call
from tests.basic_env import TestDvc
from tests.utils.httpd import StaticFileServer
from tests.utils.logger import MockLoggerHandlers
from dvc.utils.compat import StringIO
@@ -53,21 +55,22 @@ class TestFailedImportMessage(TestDvc):
@patch("dvc.command.imp.urlparse")
def _test(self, imp_urlparse_patch):
logger.logger.handlers[1].stream = StringIO()
page_address = "http://somesite.com/file_name"
with MockLoggerHandlers(logger.logger):
logger.logger.handlers[1].stream = StringIO()
page_address = "http://somesite.com/file_name"
def dvc_exception(*args, **kwargs):
raise DvcException("message")
def dvc_exception(*args, **kwargs):
raise DvcException("message")
imp_urlparse_patch.side_effect = dvc_exception
main(["import", page_address])
self.assertIn(
"Error: failed to import "
"http://somesite.com/file_name. You could also try "
"downloading it manually and adding it with `dvc add` "
"command.",
logger.logger.handlers[1].stream.getvalue(),
)
imp_urlparse_patch.side_effect = dvc_exception
main(["import", page_address])
self.assertIn(
"Error: failed to import "
"http://somesite.com/file_name. You could also try "
"downloading it manually and adding it with `dvc add` "
"command.",
logger.logger.handlers[1].stream.getvalue(),
)
class TestInterruptedDownload(TestDvc):
+4
View File
@@ -14,6 +14,10 @@ class TestLogger(TestCase):
color_patch = patch.object(logger, "colorize", new=lambda x, color="": x)
def setUp(self):
logger.logger.handlers = [
logger.logging.StreamHandler(),
logger.logging.StreamHandler(),
]
logger.logger.handlers[0].stream = StringIO()
logger.logger.handlers[1].stream = StringIO()
logger.set_default_level()
+20
View File
@@ -0,0 +1,20 @@
import logging
class MockLoggerHandlers(object):
def __init__(self, l, num=2):
self._logger = l
self._handlers = l.handlers
self._num = num
def __enter__(self):
self._logger.handlers = [
logging.FileHandler("tmp{}.log".format(i))
for i in range(self._num)
]
return self
def __exit__(self, exc_type=None, exc_val=None, exc_tb=None):
for h in self._logger.handlers:
h.close()
self._logger.handlers = self._handlers