diff --git a/payu/laboratory.py b/payu/laboratory.py index cf74ea08..a9d24c14 100644 --- a/payu/laboratory.py +++ b/payu/laboratory.py @@ -14,11 +14,11 @@ The configured laboratory directory may not have write access. Edit/remove one (or more) of the following config.yaml options that determine the laboratory path: + - 'project': The project to use for payu PBS jobs. Default: ${PROJECT} + - 'shortpath' Top-level directory for laboratory + Default: /scratch/${PROJECT} - 'laboratory': Top-level directory for the model laboratory Default: /scratch/${PROJECT}/${USER}/${MODEL} - - 'shortpath' Top-level directory for laboratory. - Default: /scratch/${PROJECT} - - 'project': The project to use for payu PBS jobs. Default: ${PROJECT} """ diff --git a/test/test_branch.py b/test/test_branch.py index 352dcf1d..9277b7a8 100644 --- a/test/test_branch.py +++ b/test/test_branch.py @@ -530,7 +530,7 @@ def test_checkout_laboratory_path_error(mock_lab_initialise): # Assert new commit has not been added assert repo.active_branch.object.hexsha == current_commit - + assert str(repo.active_branch) == "Branch1" assert not (ctrldir / "metadata.yaml").exists()