p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added more logs to testing output and changed printing to logging to attach testing output to test

This commit is contained in:
Shay Nehmad 2019-10-07 12:20:19 +03:00
parent 3336956737
commit ff3c455cb0
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
envs/monkey_zoo/blackbox/log_handlers/monkey_log_parser.py
View File

@ -1,5 +1,8 @@
import logging
import re import re
LOGGER = logging.getLogger(__name__)
class MonkeyLogParser(object): class MonkeyLogParser(object):
@ -14,11 +17,11 @@ class MonkeyLogParser(object):
def print_errors(self): def print_errors(self):
errors = MonkeyLogParser.get_errors(self.log_contents) errors = MonkeyLogParser.get_errors(self.log_contents)
if len(errors) > 0: if len(errors) > 0:
print("Found {} errors:".format(len(errors))) LOGGER.info("Found {} errors:".format(len(errors)))
for error_line in errors: for index, error_line in enumerate(errors):
print(error_line) LOGGER.info("Err #{}: {}".format(index, error_line))
else: else:
print("No errors!") LOGGER.info("No errors!")
@staticmethod @staticmethod
def get_errors(log_contents): def get_errors(log_contents):
@ -28,11 +31,11 @@ class MonkeyLogParser(object):
def print_warnings(self): def print_warnings(self):
warnings = MonkeyLogParser.get_warnings(self.log_contents) warnings = MonkeyLogParser.get_warnings(self.log_contents)
if len(warnings) > 0: if len(warnings) > 0:
print("Found {} warnings:".format(len(warnings))) LOGGER.info("Found {} warnings:".format(len(warnings)))
for warning_line in warnings: for index, warning_line in enumerate(warnings):
print(warning_line) LOGGER.info("Warn #{}: {}".format(index, warning_line))
else: else:
print("No warnings!") LOGGER.info("No warnings!")
@staticmethod @staticmethod
def get_warnings(log_contents): def get_warnings(log_contents):

2
envs/monkey_zoo/blackbox/log_handlers/test_logs_handler.py
View File

@ -44,7 +44,7 @@ class TestLogsHandler(object):
@staticmethod @staticmethod
def parse_logs(log_paths): def parse_logs(log_paths):
for log_path in log_paths: for log_path in log_paths:
print("Info from log at {}".format(log_path)) LOGGER.info("Info from log at {}".format(log_path))
log_parser = MonkeyLogParser(log_path) log_parser = MonkeyLogParser(log_path)
log_parser.print_errors() log_parser.print_errors()
log_parser.print_warnings() log_parser.print_warnings()

3
envs/monkey_zoo/blackbox/tests/basic_test.py
View File

@ -78,12 +78,13 @@ class BasicTest(object):
while not self.island_client.is_all_monkeys_dead() and time_passed < MAX_TIME_FOR_MONKEYS_TO_DIE: while not self.island_client.is_all_monkeys_dead() and time_passed < MAX_TIME_FOR_MONKEYS_TO_DIE:
sleep(WAIT_TIME_BETWEEN_REQUESTS) sleep(WAIT_TIME_BETWEEN_REQUESTS)
time_passed += WAIT_TIME_BETWEEN_REQUESTS time_passed += WAIT_TIME_BETWEEN_REQUESTS
LOGGER.debug("Waiting for all monkeys to die. Time passed: {}".format(time_passed))
if time_passed > MAX_TIME_FOR_MONKEYS_TO_DIE: if time_passed > MAX_TIME_FOR_MONKEYS_TO_DIE:
LOGGER.error("Some monkeys didn't die after the test, failing") LOGGER.error("Some monkeys didn't die after the test, failing")
assert False assert False
def parse_logs(self): def parse_logs(self):
LOGGER.info("\nParsing test logs:") LOGGER.info("Parsing test logs:")
self.log_handler.parse_test_logs() self.log_handler.parse_test_logs()
@staticmethod @staticmethod