Skip to content

Commit

Permalink
Fix publish to GitHub (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
Cariad Eccleston authored Jan 19, 2021
1 parent db97251 commit 2e9dcac
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
asset_path: ${{ env.DISTRIBUTABLE }}
asset_content_type: application/x-wheel+zip
asset_name: ${{ env.DISTRIBUTABLE }}
asset_path: ${{ env.DISTRIBUTABLE }}
upload_url: ${{ steps.get_release.outputs.upload_url }}

publish_to_pypi:
Expand Down
12 changes: 12 additions & 0 deletions wev/logging/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@


def get_logger(name: str = "wev") -> Logger:
"""
Gets a logger.
Arguments:
name: Name of the logger. Defaults to "wev". When getting a logger for
a plugin, use the plugin's name.
Returns:
Logger.
"""

global done_init

if not done_init:
Expand All @@ -18,6 +29,7 @@ def get_logger(name: str = "wev") -> Logger:

logger = getLogger(name)

# Register our `Formatter` as a handler if it hasn't already.
for handler in logger.handlers:
if isinstance(handler.formatter, Formatter):
break
Expand Down
49 changes: 49 additions & 0 deletions wev/logging/test_log.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
from mock import Mock, patch

from wev.logging.formatter import Formatter
from wev.logging.log import get_logger


@patch("wev.logging.log.StreamHandler")
@patch("wev.logging.log.getLogger")
@patch("wev.logging.log.stdout")
def test_get_logger__adds_handler(
stdout: Mock,
logger_maker: Mock,
stream_handler_maker: Mock,
) -> None:
stream_handler = Mock()
stream_handler_maker.return_value = stream_handler

logger = Mock()
logger_maker.return_value = logger

addHandler = Mock()
logger.addHandler = addHandler

not_our_handler = Mock()
not_our_handler.formatter = Mock()
logger.handlers = [not_our_handler]

assert get_logger()

stream_handler_maker.assert_called_once_with(stdout)
addHandler.assert_called_once_with(stream_handler)


@patch("wev.logging.log.getLogger")
def test_get_logger__adds_handler_once(logger_maker: Mock) -> None:
stream_handler = Mock()
stream_handler.formatter = Formatter(name="test")

logger = Mock()
logger_maker.return_value = logger

addHandler = Mock()
logger.addHandler = addHandler

logger.handlers = [stream_handler]

get_logger()

addHandler.assert_not_called()

0 comments on commit 2e9dcac

Please sign in to comment.