diff --git a/tests/test_webservice.py b/tests/test_webservice.py index 73f015d82964b8db1b6bd84b8c0d18e70245610f..8ce9afe6c0ee756e026fcbf92afe0ae6f265e5d5 100644 --- a/tests/test_webservice.py +++ b/tests/test_webservice.py @@ -268,8 +268,8 @@ async def test_run_action(mode, cmd, retcode, expected, monkeypatch): (42, 'correct', 'A', [INVALID_BEAMTIME], 'exfel'), # active but not in beamtime (42, 'correct', 'A', [VALID_BEAMTIME], 'upex-middle'), # active ('42', 'dark', 'R', [VALID_BEAMTIME, {}], 'upex-high'), # active - (42, 'correct', 'A', [], 'exfel'), # active, no beatime? - (42, 'correct', 'A', None, 'exfel'), # active, no beatime? + (42, 'correct', 'A', [], 'exfel'), # active, no beamtime? + (42, 'correct', 'A', None, 'exfel'), # active, no beamtime? ], ) async def test_get_slurm_partition( diff --git a/webservice/webservice.py b/webservice/webservice.py index 58c40228073ad5f656d1e66388f7cd1d879b7042..d8a5e532648dfedaefeb43728c553951844a0425 100644 --- a/webservice/webservice.py +++ b/webservice/webservice.py @@ -606,11 +606,12 @@ async def get_slurm_partition( partition = 'exfel' logging.debug( f"{run_age.days} > {max_age_days}, set partition " - "to {partition}" + f"to {partition}" ) logging.debug( - f"Using {partition} for {proposal_number} because {status_beamtime} and active now: {active_now}" + f"Using {partition} for {proposal_number} because {status_beamtime} " + f"and active now: {active_now}" ) return partition