Skip to content
Snippets Groups Projects
Commit 2a7f67a5 authored by Gavin's avatar Gavin
Browse files

removed whitespace and addressed feedback from pr

parent 2f60fc51
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,6 @@ from autocnet.utils.utils import import_func ...@@ -20,7 +20,6 @@ from autocnet.utils.utils import import_func
from autocnet.utils.serializers import JsonEncoder, object_hook from autocnet.utils.serializers import JsonEncoder, object_hook
from autocnet.io.db.model import JobsHistory from autocnet.io.db.model import JobsHistory
# set up the logging file
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def parse_args(): # pragma: no cover def parse_args(): # pragma: no cover
...@@ -231,7 +230,7 @@ def manage_messages(args, queue): ...@@ -231,7 +230,7 @@ def manage_messages(args, queue):
def main(): # pragma: no cover def main(): # pragma: no cover
args = vars(parse_args()) args = vars(parse_args())
# set up the logger # set up the logger
logging.basicConfig(level=os.environ.get("autocnet_loglevel", "INFO")) logging.basicConfig(level=os.environ.get("AUTOCNET_LOGLEVEL", "INFO"))
# Get the message # Get the message
queue = StrictRedis(host=args['host'], port=args['port'], db=0) queue = StrictRedis(host=args['host'], port=args['port'], db=0)
manage_messages(args, queue) manage_messages(args, queue)
......
...@@ -172,9 +172,21 @@ def test_process_row(along, func, msg_additions, mocker): ...@@ -172,9 +172,21 @@ def test_process_row(along, func, msg_additions, mocker):
cluster_submit._instantiate_row.assert_called_once() cluster_submit._instantiate_row.assert_called_once()
@pytest.mark.parametrize() @pytest.mark.parametrize()
def _do_something(): def _do_something(log_level):
log.debug("Doing something!") return getattr(log, log_level)(f'Logging at the {log_level}')
log.info("This is some info")
def test_do_something(caplog):
log_levels = ["critical", "error", "warning", "info", "debug"]
for level in log_levels:
os.environ["AUTOCNET_LOGLEVEL"] = level
_do_something(os.environ["AUTOCNET_LOGLEVEL"])
for record in caplog.records:
# casting the env var and record level to a string for comparison
assert(str(os.environ["AUTOCNET_LOGLEVEL"]).upper() == str(record.levelname).upper())
caplog.clear()
@pytest.mark.parametrize("along, func, msg_additions",[ @pytest.mark.parametrize("along, func, msg_additions",[
([1,2,3,4,5], _do_nothing, {}) ([1,2,3,4,5], _do_nothing, {})
...@@ -190,7 +202,6 @@ def test_process_generic(along, func, msg_additions, mocker): ...@@ -190,7 +202,6 @@ def test_process_generic(along, func, msg_additions, mocker):
mocker.patch('autocnet.graph.cluster_submit._instantiate_obj', side_effect=_generate_obj) mocker.patch('autocnet.graph.cluster_submit._instantiate_obj', side_effect=_generate_obj)
mocker.patch('autocnet.graph.network.NetworkCandidateGraph.Session', return_value=True) mocker.patch('autocnet.graph.network.NetworkCandidateGraph.Session', return_value=True)
mocker.patch('autocnet.graph.network.NetworkCandidateGraph.config_from_dict') mocker.patch('autocnet.graph.network.NetworkCandidateGraph.config_from_dict')
_do_something()
assert not cluster_submit._instantiate_row.called assert not cluster_submit._instantiate_row.called
assert not cluster_submit._instantiate_obj.called assert not cluster_submit._instantiate_obj.called
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment