Skip to content
This repository was archived by the owner on Aug 23, 2020. It is now read-only.

Commit 2a5cf10

Browse files
authored
Update regression logging (#1803)
1 parent 0e39213 commit 2a5cf10

File tree

11 files changed

+26
-33
lines changed

11 files changed

+26
-33
lines changed

python-regression/tests/features/steps/api_test_steps.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
from aloe import *
22
from util import static_vals
3+
from util import logger as log
34
from util.test_logic import api_test_logic as api_utils
45
from util.threading_logic import pool_logic as pool
56
from util.neighbor_logic import neighbor_logic as neighbors
67
from util.response_logic import response_handling as responses
78
from time import sleep, time
89

9-
import logging
10-
logging.basicConfig(level=logging.INFO)
11-
logger = logging.getLogger(__name__)
10+
logger = log.getLogger(__name__)
1211

1312
testAddress = static_vals.TEST_ADDRESS
1413

python-regression/tests/features/steps/local_snapshots_steps.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
from aloe import step
22
from util.test_logic import api_test_logic as api_utils
3+
from util import logger as log
34

4-
import logging
5-
logging.basicConfig(level=logging.INFO)
6-
logger = logging.getLogger(__name__)
5+
logger = log.getLogger(__name__)
76

87

98
@step(r'A local snapshot was taken on "([^"]+)" at index (\d+)')

python-regression/tests/features/steps/response_handling_steps.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import logging
21
from aloe import world, step
32
from util.response_logic import response_handling as response_handling
43
from util.test_logic import api_test_logic as api_utils
54
from util.test_logic import value_fetch_logic
65

7-
logging.basicConfig(level=logging.INFO)
8-
logger = logging.getLogger(__name__)
6+
from util import logger as log
7+
logger = log.getLogger(__name__)
98

109
world.test_vars = {}
1110

python-regression/tests/features/steps/transaction_steps.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
from aloe import world, step
22
from iota import Transaction
33
from util import static_vals as static
4+
from util import logger as log
45
from util.test_logic import api_test_logic as api_utils
56
from util.transaction_bundle_logic import transaction_logic as transactions
67
from util.milestone_logic import milestones
78
from time import sleep
89

9-
import logging
10-
logging.basicConfig(level=logging.INFO)
11-
logger = logging.getLogger(__name__)
12-
10+
logger = log.getLogger(__name__)
1311

1412
@step(r'a transaction is generated and attached on "([^"]+)" with:')
1513
def generate_transaction_and_attach(step, node):
@@ -204,7 +202,7 @@ def wait_for_update(index, api):
204202
if node_info['latestSolidSubtangleMilestoneIndex'] == index:
205203
updated = True
206204
break
207-
i += 1;
205+
i += 1
208206
sleep(1)
209207

210208
assert updated is True, "The node was unable to update to index {}".format(index)

python-regression/util/logger.py

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import logging
2+
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s: %(message)s')
3+
4+
def getLogger(name):
5+
return logging.getLogger(name)

python-regression/util/milestone_logic/milestones.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
from iota import ProposedTransaction, ProposedBundle, Tag, Address, Transaction
22
from util import conversion as converter
3+
from util import logger as log
34
from util.transaction_bundle_logic import bundle_logic
45

5-
import logging
6-
logging.basicConfig(level=logging.INFO)
7-
logger = logging.getLogger(__name__)
8-
6+
logger = log.getLogger(__name__)
97

108
def issue_milestone(address, api, index, *reference_transaction):
119
txn1 = ProposedTransaction(

python-regression/util/neighbor_logic/neighbor_logic.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import logging
2-
logging.basicConfig(level=logging.INFO)
3-
logger = logging.getLogger(__name__)
1+
from util import logger as log
2+
logger = log.getLogger(__name__)
43

54

65
def check_if_neighbors(api, neighbors, expected_neighbor):

python-regression/util/response_logic/response_handling.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import logging
21
from util.threading_logic import pool_logic as pool
2+
from util import logger as log
33

4-
logging.basicConfig(level=logging.INFO)
5-
logger = logging.getLogger(__name__)
4+
logger = log.getLogger(__name__)
65

76

87
def find_in_response(key, response):

python-regression/util/test_logic/api_test_logic.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import json
2-
import logging
32
import urllib3
43
from aloe import world
54
from iota import Iota, Address, Tag, TryteString
65

76
from . import value_fetch_logic as value_fetch
7+
from util import logger as log
88

9-
logging.basicConfig(level=logging.INFO)
10-
logger = logging.getLogger(__name__)
9+
logger = log.getLogger(__name__)
1110

1211

1312
def prepare_api_call(node_name, **kwargs):

python-regression/util/threading_logic/pool_logic.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from multiprocessing.dummy import Pool
2-
import logging
3-
logging.basicConfig(level=logging.DEBUG)
4-
logger = logging.getLogger(__name__)
2+
from util import logger as log
3+
logger = log.getLogger(__name__)
54

65

76
def start_pool(function, iterations, args):

python-regression/util/transaction_bundle_logic/transaction_logic.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
from util import static_vals as static
33
from util.test_logic import api_test_logic as api_utils
44
from util.test_logic import value_fetch_logic as value_fetch
5-
import logging
5+
from util import logger as log
66

7-
logging.basicConfig(level=logging.INFO)
8-
logger = logging.getLogger(__name__)
7+
logger = log.getLogger(__name__)
98

109

1110
def create_transaction_bundle(address, tag, value):

0 commit comments

Comments
 (0)