diff --git a/.travis.yml b/.travis.yml index 26f227b..67913e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python python: - "2.7" install: - - pip install -r test_requirements.txt --use-mirrors + - pip install -r test_requirements.txt script: bash test.sh -q after_success: coveralls diff --git a/gitreload/config.py b/gitreload/config.py index dd0a6b0..a2bda4c 100644 --- a/gitreload/config.py +++ b/gitreload/config.py @@ -57,7 +57,7 @@ def configure_logging(level_override=None): elif os.path.exists('/var/run/syslog'): address = '/var/run/syslog' else: - address = ('127.0.0.1', 514) + address = ('127.0.0.1', 514) # pylint: disable=redefined-variable-type # Add syslog handler before adding formatters root_logger.addHandler( SysLogHandler(address=address, facility=SysLogHandler.LOG_LOCAL0) diff --git a/gitreload/processing.py b/gitreload/processing.py index f4b9943..14e3da0 100644 --- a/gitreload/processing.py +++ b/gitreload/processing.py @@ -28,6 +28,7 @@ def import_repo(action_call): '--settings={0}'.format(settings['DJANGO_SETTINGS']), 'git_add_course', action_call.repo_url, + '--directory_path', os.path.join(settings['REPODIR'], action_call.repo_name), ] @@ -157,10 +158,12 @@ def run(self): # pragma: no cover due to multiprocessing """ while True: action_call = self.queue.get() - log.info('Starting GitAction task {0} out ' - 'of {1} on thread {2}'.format( - action_call, len(self.queued_jobs), self.thread_num - )) + log.info( + 'Starting GitAction task %s out of %s on thread %s', + action_call, + len(self.queued_jobs), + self.thread_num + ) try: log.debug('Used %s as index to ACTION_COMMANDS', action_call.action_type) diff --git a/gitreload/tests/test_config.py b/gitreload/tests/test_config.py index e9538d7..59a25f5 100644 --- a/gitreload/tests/test_config.py +++ b/gitreload/tests/test_config.py @@ -1,9 +1,9 @@ """ Unit tests to validate configuration loading """ -import mock import os import unittest +import mock from .base import TEST_ROOT @@ -139,7 +139,7 @@ def test_syslog_devices(self): # Nuke syslog handlers from init syslog_handlers = [] for handler in root_logger.handlers: - if type(handler) is logging.handlers.SysLogHandler: + if isinstance(handler, logging.handlers.SysLogHandler): syslog_handlers.append(handler) for handler in syslog_handlers: root_logger.removeHandler(handler) @@ -163,7 +163,7 @@ def mock_effect(*args): configure_logging() syslog_handler = None for handler in root_logger.handlers: - if type(handler) is logging.handlers.SysLogHandler: + if isinstance(handler, logging.handlers.SysLogHandler): syslog_handler = handler self.assertIsNotNone(syslog_handler) if log_device == '': diff --git a/gitreload/tests/test_processing.py b/gitreload/tests/test_processing.py index 4ef37e2..4456966 100644 --- a/gitreload/tests/test_processing.py +++ b/gitreload/tests/test_processing.py @@ -1,10 +1,10 @@ """ Tests related to the processing module """ -import mock import os import shutil import subprocess +import mock from git import Repo @@ -90,6 +90,7 @@ def test_command_error_and_input(self, mocked_logging): '--settings=aws', 'git_add_course', 'NOTREAL', + '--directory_path', '/mnt/data/repos/NOTREAL'], cwd='/edx/app/edxapp/edx-platform', stderr=-2 diff --git a/gitreload/tests/test_web.py b/gitreload/tests/test_web.py index f1272bc..c25c3d8 100644 --- a/gitreload/tests/test_web.py +++ b/gitreload/tests/test_web.py @@ -9,8 +9,8 @@ import mock from git import Repo -from .base import GitreloadTestBase import gitreload.web +from .base import GitreloadTestBase class TestWebApplication(GitreloadTestBase):