Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ matrix:
env: TOXENV=py37
install:
- pip install tox
before_install:
- export BOTO_CONFIG=/dev/null
script:
- tox
notifications:
Expand Down
2 changes: 1 addition & 1 deletion rekcurd_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
__project__ = _project.__project__
__version__ = _version.__version__

from .rekcurd_worker_client import RekcurdWorkerClient
from .core import RekcurdWorkerClient
1 change: 1 addition & 0 deletions rekcurd_client/core/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .rekcurd_worker_client import RekcurdWorkerClient
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import types
import grpc

from .protobuf import rekcurd_pb2, rekcurd_pb2_grpc
from .logger import SystemLoggerInterface
from rekcurd_client.protobuf import rekcurd_pb2, rekcurd_pb2_grpc
from rekcurd_client.logger import SystemLoggerInterface


def error_handling(error_response):
Expand Down
1 change: 1 addition & 0 deletions rekcurd_client/logger/logger_fluent.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self, logger_name: str = 'rekcurd_client', log_level: int = logging
formatter = handler.FluentRecordFormatter(custom_format)
fluent_handler.setFormatter(formatter)
fluent_handler.setLevel(log_level)
self.log.handlers = []
self.log.addHandler(fluent_handler)

def exception(self, message: str) -> None:
Expand Down
1 change: 1 addition & 0 deletions rekcurd_client/logger/logger_jsonlogger.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def __init__(self, logger_name: str = 'rekcurd_client', log_level: int = logging
handler = logging.StreamHandler()
formatter = self.JsonFormatter()
handler.setFormatter(formatter)
self.log.handlers = []
self.log.addHandler(handler)
self.log.setLevel(log_level)

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
install_requires=REQUIRES,
tests_require=TESTS_REQUIRES,
extras_require=EXTRAS,
packages=['rekcurd_client', 'rekcurd_client.logger',
'rekcurd_client.protobuf'],
packages=['rekcurd_client', 'rekcurd_client.core',
'rekcurd_client.logger', 'rekcurd_client.protobuf'],
include_package_data=True,
long_description=LONG_DESCRIPTION,
classifiers=[
Expand Down
Empty file added test/core/__init__.py
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from rekcurd.utils import PredictResult

import rekcurd_client.rekcurd_worker_client
import rekcurd_client.core.rekcurd_worker_client
from rekcurd_client.protobuf import rekcurd_pb2_grpc
from rekcurd_client.logger import logger
from rekcurd_client import RekcurdWorkerClient
Expand Down Expand Up @@ -409,7 +409,7 @@ def _run_arrstring_arrstring(client: RekcurdWorkerClient):

def run(scenario, channel):
stub = rekcurd_pb2_grpc.RekcurdWorkerStub(channel)
client = rekcurd_client.rekcurd_worker_client.RekcurdWorkerClient(logger=logger, domain='example.com', app='rekcurd-sample', env='development')
client = rekcurd_client.core.rekcurd_worker_client.RekcurdWorkerClient(logger=logger, domain='example.com', app='rekcurd-sample', env='development')
client.stub = stub
try:
return _IMPLEMENTATIONS[scenario](client)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
import grpc_testing

from rekcurd_client.protobuf import rekcurd_pb2
from . import _client_application

from test.core import _client_application

target_service = rekcurd_pb2.DESCRIPTOR.services_by_name['RekcurdWorker']

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import grpc
from concurrent import futures

from . import *
from test import *
from rekcurd_client.protobuf import rekcurd_pb2_grpc
import unittest
from functools import wraps
from unittest.mock import patch, Mock

from rekcurd.utils import PredictResult
import rekcurd_client.rekcurd_worker_client
import rekcurd_client.core.rekcurd_worker_client


def patch_predictor(input_type, output_type):
Expand Down Expand Up @@ -87,7 +87,7 @@ def setUpClass(cls):
server.add_insecure_port("[::]:5000")
server.start()
cls.server = server
cls.client = rekcurd_client.rekcurd_worker_client.RekcurdWorkerClient(logger=client_logger, host='127.0.0.1:5000')
cls.client = rekcurd_client.core.rekcurd_worker_client.RekcurdWorkerClient(logger=client_logger, host='127.0.0.1:5000')

@classmethod
def tearDownClass(cls):
Expand Down
Empty file added test/logger/__init__.py
Empty file.
26 changes: 26 additions & 0 deletions test/logger/test_logger_fluent.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import unittest

from rekcurd_client.logger import FluentSystemLogger


class FluentSystemLoggerTest(unittest.TestCase):
"""Tests for FluentSystemLogger.
"""

def setUp(self):
self.logger = FluentSystemLogger()

def test_exception(self):
self.assertIsNone(self.logger.exception("Exception"))

def test_error(self):
self.assertIsNone(self.logger.error("Error"))

def test_debug(self):
self.assertIsNone(self.logger.debug("Debug"))

def test_info(self):
self.assertIsNone(self.logger.info("Info"))

def test_warn(self):
self.assertIsNone(self.logger.warn("Warn"))
26 changes: 26 additions & 0 deletions test/logger/test_logger_jsonlogger.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import unittest

from rekcurd_client.logger import JsonSystemLogger


class JsonSystemLoggerTest(unittest.TestCase):
"""Tests for JsonSystemLogger.
"""

def setUp(self):
self.logger = JsonSystemLogger()

def test_exception(self):
self.assertIsNone(self.logger.exception("Exception"))

def test_error(self):
self.assertIsNone(self.logger.error("Error"))

def test_debug(self):
self.assertIsNone(self.logger.debug("Debug"))

def test_info(self):
self.assertIsNone(self.logger.info("Info"))

def test_warn(self):
self.assertIsNone(self.logger.warn("Warn"))
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ deps = -r{toxinidir}/test-requirements.txt
commands =
python -V
py.test -vvv -s
# Patch for https://github.com/travis-ci/travis-ci/issues/7940
setenv =
BOTO_CONFIG = /dev/null

[testenv:coverage]
commands =
python -V
nosetests --with-coverage --cover-package=rekcurd_client --cover-tests
nosetests --with-coverage --cover-package=rekcurd_client.core,rekcurd_client.logger --cover-tests

[testenv:codecov]
commands =
Expand Down