From d07b9eaef4b138f4fe51b121e48e74d13cb62b44 Mon Sep 17 00:00:00 2001 From: allburov Date: Tue, 12 Nov 2019 12:02:30 +0700 Subject: [PATCH] Fix py27 tests --- pre_commit/output.py | 10 +++++----- tests/commands/run_test.py | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pre_commit/output.py b/pre_commit/output.py index aa354779..96bb4b2c 100644 --- a/pre_commit/output.py +++ b/pre_commit/output.py @@ -89,7 +89,7 @@ def write_line(s=None, stream=stdout_byte_stream, logfile_name=None): output_stream.flush() -class NormalOutput: +class NormalOutput(object): def __init__(self, mgr): self.mgr = mgr @@ -109,7 +109,7 @@ class LazyOutputProxy(NormalOutput): """ def __init__(self, mgr): - super().__init__(mgr) + super(LazyOutputProxy, self).__init__(mgr) self._calls = [] self.status = None @@ -129,7 +129,7 @@ class LazyOutputProxy(NormalOutput): call() -class NormalMode: +class NormalMode(object): """ Normal output - pass calls to real methods """ @@ -154,7 +154,7 @@ class QuietMode(NormalMode): output_proxy = LazyOutputProxy def __init__(self, hooks, cols, clr): - super().__init__(hooks, cols, clr) + super(QuietMode, self).__init__(hooks, cols, clr) self._proxies = [] self._closed = False self._msg = 'Running {} hooks'.format(len(hooks)) @@ -168,7 +168,7 @@ class QuietMode(NormalMode): def get_output(self): """ Return new instance of collector """ - proxy = super().get_output() + proxy = super(QuietMode, self).get_output() self._proxies.append(proxy) return proxy diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py index ef046fa4..347a752b 100644 --- a/tests/commands/run_test.py +++ b/tests/commands/run_test.py @@ -6,6 +6,7 @@ import os.path import pipes import subprocess import sys +from itertools import chain import mock import pytest @@ -130,34 +131,34 @@ START_MSG_3_HOOKS = ( @pytest.mark.parametrize( ('expected_outputs', 'unexpected_outputs', 'args', 'exp_ret'), [ ( - [*PASSED_MSG, *FAILED_MSG, *SKIPPED_MSG], - [*START_MSG_3_HOOKS], + chain(PASSED_MSG, FAILED_MSG, SKIPPED_MSG), + chain(START_MSG_3_HOOKS), {'quiet': False}, 1, ), ( - [*START_MSG_3_HOOKS, *FAILED_MSG], - [*PASSED_MSG, *SKIPPED_MSG], + chain(START_MSG_3_HOOKS, FAILED_MSG), + chain(PASSED_MSG, SKIPPED_MSG), {'quiet': True}, 1, ), ( [b'Running 1 hooks', b'Passed'], - [b'Passing hook', *SKIPPED_MSG, *FAILED_MSG], + chain([b'Passing hook'], SKIPPED_MSG, FAILED_MSG), {'quiet': True, 'hook': 'passing_hook'}, 0, ), ( [b'Running 1 hooks', b'Skipped'], - [b'Skipping hook', *FAILED_MSG], + chain([b'Skipping hook'], FAILED_MSG), {'quiet': True, 'hook': 'skipping_hook'}, 0, ), ( - [b'Running 1 hooks', b'Failed', *FAILED_MSG], + chain([b'Running 1 hooks', b'Failed'], FAILED_MSG), [], {'quiet': True, 'hook': 'failing_hook'}, 1, ), # Verbose must suppresses quiet mode ( - [*PASSED_MSG, *FAILED_MSG, *SKIPPED_MSG], - [*START_MSG_3_HOOKS], + chain(PASSED_MSG, FAILED_MSG, SKIPPED_MSG), + chain(START_MSG_3_HOOKS), {'quiet': True, 'verbose': True}, 1, ), ],