mirror of https://github.com/docker/compose.git
Remove the duplicate 'Warning' prefix now that the logger adds the prefix.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
d836973a04
commit
841ed4ed21
|
@ -59,9 +59,8 @@ def main():
|
|||
log.error(e.msg)
|
||||
sys.exit(1)
|
||||
except NoSuchCommand as e:
|
||||
log.error("No such command: %s", e.command)
|
||||
log.error("")
|
||||
log.error("\n".join(parse_doc_section("commands:", getdoc(e.supercommand))))
|
||||
commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
|
||||
log.error("No such command: %s\n\n%s", e.command, commands)
|
||||
sys.exit(1)
|
||||
except APIError as e:
|
||||
log.error(e.explanation)
|
||||
|
|
|
@ -57,9 +57,11 @@ def format_boolean_in_environment(instance):
|
|||
"""
|
||||
if isinstance(instance, bool):
|
||||
log.warn(
|
||||
"Warning: There is a boolean value in the 'environment' key.\n"
|
||||
"Environment variables can only be strings.\nPlease add quotes to any boolean values to make them string "
|
||||
"(eg, 'True', 'yes', 'N').\nThis warning will become an error in a future release. \r\n"
|
||||
"There is a boolean value in the 'environment' key.\n"
|
||||
"Environment variables can only be strings.\n"
|
||||
"Please add quotes to any boolean values to make them string "
|
||||
"(eg, 'True', 'yes', 'N').\n"
|
||||
"This warning will become an error in a future release. \r\n"
|
||||
)
|
||||
return True
|
||||
|
||||
|
|
|
@ -862,7 +862,7 @@ class ServiceNet(object):
|
|||
if containers:
|
||||
return 'container:' + containers[0].id
|
||||
|
||||
log.warn("Warning: Service %s is trying to use reuse the network stack "
|
||||
log.warn("Service %s is trying to use reuse the network stack "
|
||||
"of another service that is not running." % (self.id))
|
||||
return None
|
||||
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import logging
|
||||
|
||||
from compose.cli import colors
|
||||
from compose.cli.formatter import ConsoleWarningFormatter
|
||||
from tests import unittest
|
||||
|
||||
|
||||
MESSAGE = 'this is the message'
|
||||
|
||||
|
||||
def makeLogRecord(level):
|
||||
return logging.LogRecord('name', level, 'pathame', 0, MESSAGE, (), None)
|
||||
|
||||
|
||||
class ConsoleWarningFormatterTestCase(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.formatter = ConsoleWarningFormatter()
|
||||
|
||||
def test_format_warn(self):
|
||||
output = self.formatter.format(makeLogRecord(logging.WARN))
|
||||
expected = colors.yellow('WARNING') + ': '
|
||||
assert output == expected + MESSAGE
|
||||
|
||||
def test_format_error(self):
|
||||
output = self.formatter.format(makeLogRecord(logging.ERROR))
|
||||
expected = colors.red('ERROR') + ': '
|
||||
assert output == expected + MESSAGE
|
||||
|
||||
def test_format_info(self):
|
||||
output = self.formatter.format(makeLogRecord(logging.INFO))
|
||||
assert output == MESSAGE
|
|
@ -380,7 +380,7 @@ class ConfigTest(unittest.TestCase):
|
|||
|
||||
@mock.patch('compose.config.validation.log')
|
||||
def test_logs_warning_for_boolean_in_environment(self, mock_logging):
|
||||
expected_warning_msg = "Warning: There is a boolean value in the 'environment' key."
|
||||
expected_warning_msg = "There is a boolean value in the 'environment' key."
|
||||
config.load(
|
||||
build_config_details(
|
||||
{'web': {
|
||||
|
|
Loading…
Reference in New Issue