Skip to content

Changed default log file name #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimboid merged 2 commits into from
Mar 28, 2019
Merged

Changed default log file name #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9ff443
Changed default log file name
jimboid Mar 28, 2019
2b7c700
fixed broken tests
jimboid Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion longbow/entrypoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ def _setuplogger(parameters):
# If no log file name was given then default to "log".
if parameters["log"] is "":

parameters["log"] = "log"
parameters["log"] = "longbow.log"

# If the path isn't absolute then create the log in CWD.
if os.path.isabs(parameters["log"]) is False:
Expand Down
36 changes: 28 additions & 8 deletions tests/unit/entrypoints/test_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ def _configload(_):

"Mock configuration"

jobs={"lbowconf": {"recoveryfile": "recovery.file"}}
jobs = {
"lbowconf": {
"recoveryfile": "recovery.file"}
}

return jobs

Expand All @@ -63,7 +66,13 @@ def _runningjobs(_):

"Set up two running jobs"

jobs = {"job1": {"laststatus": "Running"}, "job2": {"laststatus": "Running"}}
jobs = {
"job1": {
"laststatus": "Running"
},
"job2": {
"laststatus": "Running"}
}

return jobs

Expand All @@ -72,7 +81,13 @@ def _finishedjobs(_):

"Set up two running jobs"

jobs = {"job1": {"laststatus": "Finished"}, "job2": {"laststatus": "Finished"}}
jobs = {
"job1": {
"laststatus": "Finished"
},
"job2": {
"laststatus": "Finished"}
}

return jobs

Expand All @@ -81,7 +96,12 @@ def _completejobs(_):

"Set up two running jobs"

jobs = {"job1": {"laststatus": "Complete"}, "job2": {"laststatus": "Complete"}}
jobs = {
"job1": {
"laststatus": "Complete"
}, "job2": {
"laststatus": "Complete"}
}

return jobs

Expand Down Expand Up @@ -115,7 +135,7 @@ def test_main_test1(m_isfile, m_longbowmain):
assert params["hosts"] == os.path.join(os.getcwd(), "hosts.conf")
assert params["job"] == ""
assert params["jobname"] == "testjob"
assert params["log"] == os.path.join(os.getcwd(), "log")
assert params["log"] == os.path.join(os.getcwd(), "longbow.log")
assert params["recover"] == ""
assert params["resource"] == ""
assert params["replicates"] == ""
Expand Down Expand Up @@ -152,7 +172,7 @@ def test_main_test2(m_isfile, m_longbowmain):
assert params["hosts"] == os.path.join(os.getcwd(), "hosts.conf")
assert params["job"] == ""
assert params["jobname"] == "testjob"
assert params["log"] == os.path.join(os.getcwd(), "log")
assert params["log"] == os.path.join(os.getcwd(), "longbow.log")
assert params["recover"] == ""
assert params["resource"] == "big-machine"
assert params["replicates"] == ""
Expand Down Expand Up @@ -264,7 +284,7 @@ def test_main_test6(m_isfile, m_longbowmain):
assert params["hosts"] == os.path.join(os.getcwd(), "hosts.conf")
assert params["job"] == ""
assert params["jobname"] == "testjob"
assert params["log"] == os.path.join(os.getcwd(), "log")
assert params["log"] == os.path.join(os.getcwd(), "longbow.log")
assert params["recover"] == ""
assert params["resource"] == "big-machine"
assert params["replicates"] == ""
Expand Down Expand Up @@ -302,7 +322,7 @@ def test_main_test7(m_isfile, m_longbowmain):
assert params["hosts"] == os.path.join(os.getcwd(), "hosts.conf")
assert params["job"] == ""
assert params["jobname"] == "testjob"
assert params["log"] == os.path.join(os.getcwd(), "log")
assert params["log"] == os.path.join(os.getcwd(), "longbow.log")
assert params["recover"] == ""
assert params["resource"] == "big-machine"
assert params["replicates"] == ""
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/entrypoints/test_setuplogger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def test_setuplogger_debug():
log.debug("debug1")
log.info("info1")

logfile = open("log", "r")
logfile = open("longbow.log", "r")
contents = logfile.readlines()

assert "debug1" in contents[0]
Expand Down Expand Up @@ -103,7 +103,7 @@ def test_setuplogger_verbose():
log.debug("debug1")
log.info("info1")

logfile = open("log", "r")
logfile = open("longbow.log", "r")
contents = logfile.readlines()

assert "debug1" not in contents[0]
Expand Down