From f30076783d5fc93d91d29e9343d62af4c0fdffaa Mon Sep 17 00:00:00 2001 From: William Luke Date: Tue, 26 Apr 2022 14:39:49 +0300 Subject: [PATCH] fix: tests --- cic/writers.py | 6 +++--- tests/base_cic.py | 11 +++++------ tests/test_keyfile.py | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cic/writers.py b/cic/writers.py index 1e98b25..a4b1295 100644 --- a/cic/writers.py +++ b/cic/writers.py @@ -26,7 +26,7 @@ class StdoutWriter(OutputWriter): class KVWriter(OutputWriter): - def __init__(self, *args, path=None, **kwargs): + def __init__(self, path=None, *args, **kwargs): try: os.stat(path) except FileNotFoundError: @@ -42,7 +42,7 @@ class KVWriter(OutputWriter): class HTTPWriter(OutputWriter): - def __init__(self, *args, path=None, **kwargs): + def __init__(self, path=None, *args, **kwargs): super(HTTPWriter, self).__init__(*args, **kwargs) self.path = path @@ -83,7 +83,7 @@ class KeyedWriterFactory: logg.debug(f"adding key {k} t keyed writer factory") self.x[k] = v - def new(self, *_args, path=None, **_kwargs): + def new(self, path=None, *_args, **_kwargs): writer_keyed = None writer_immutable = None if self.key_writer_constructor is not None: diff --git a/tests/base_cic.py b/tests/base_cic.py index a385373..e909ea4 100644 --- a/tests/base_cic.py +++ b/tests/base_cic.py @@ -4,15 +4,14 @@ import random import tempfile import unittest -from cic.contract.components.attachment import Attachment -from cic.contract.components.proof import Proof -from cic.contract.processor import ContractProcessor +# external imports +from hexathon import add_0x # local imports from cic.writers import KVWriter - -# external imports -from hexathon import add_0x +from cic.contract.components.attachment import Attachment +from cic.contract.components.proof import Proof +from cic.contract.processor import ContractProcessor test_base_dir = os.path.dirname(os.path.realpath(__file__)) test_data_dir = os.path.join(test_base_dir, "testdata") diff --git a/tests/test_keyfile.py b/tests/test_keyfile.py index 89fa1b0..9ce50ca 100644 --- a/tests/test_keyfile.py +++ b/tests/test_keyfile.py @@ -14,7 +14,7 @@ from cic.keystore import KeystoreDirectory # test imports from tests.base_cic import test_base_dir -logging = logging.getLogger() +log = logging.getLogger(__name__) script_dir = test_base_dir