From 2a7f67a5f96769e1eaf8cfb5312f56dc35c2e0ef Mon Sep 17 00:00:00 2001
From: Gavin <nelsong916@gmail.com>
Date: Thu, 9 Dec 2021 10:40:22 -0700
Subject: [PATCH] removed whitespace and addressed feedback from pr
---
autocnet/graph/cluster_submit.py | 3 +--
autocnet/graph/tests/test_cluster_submit.py | 19 +++++++++++++++----
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/autocnet/graph/cluster_submit.py b/autocnet/graph/cluster_submit.py
index 5e240b20..da49b4ff 100644
--- a/autocnet/graph/cluster_submit.py
+++ b/autocnet/graph/cluster_submit.py
@@ -20,7 +20,6 @@ from autocnet.utils.utils import import_func
from autocnet.utils.serializers import JsonEncoder, object_hook
from autocnet.io.db.model import JobsHistory
-# set up the logging file
log = logging.getLogger(__name__)
def parse_args(): # pragma: no cover
@@ -231,7 +230,7 @@ def manage_messages(args, queue):
def main(): # pragma: no cover
args = vars(parse_args())
# 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
queue = StrictRedis(host=args['host'], port=args['port'], db=0)
manage_messages(args, queue)
diff --git a/autocnet/graph/tests/test_cluster_submit.py b/autocnet/graph/tests/test_cluster_submit.py
index c3b3b16f..70cb5f43 100644
--- a/autocnet/graph/tests/test_cluster_submit.py
+++ b/autocnet/graph/tests/test_cluster_submit.py
@@ -172,9 +172,21 @@ def test_process_row(along, func, msg_additions, mocker):
cluster_submit._instantiate_row.assert_called_once()
@pytest.mark.parametrize()
-def _do_something():
- log.debug("Doing something!")
- log.info("This is some info")
+def _do_something(log_level):
+ return getattr(log, log_level)(f'Logging at the {log_level}')
+
+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",[
([1,2,3,4,5], _do_nothing, {})
@@ -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.network.NetworkCandidateGraph.Session', return_value=True)
mocker.patch('autocnet.graph.network.NetworkCandidateGraph.config_from_dict')
- _do_something()
assert not cluster_submit._instantiate_row.called
assert not cluster_submit._instantiate_obj.called
--
GitLab