Merge branch 'master' into fix/xx/key-policy-filename-configure

aiidalab · Nov 10, 2023 · 937241a · 937241a
2 parents 8ef3953 + 9277a67
commit 937241a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tests/test_computational_resources.py b/tests/test_computational_resources.py
@@ -509,7 +509,7 @@ def test_resource_setup_widget_default():
     # and the computer/code setup widget will be updated accordingly.
     w.comp_resources_database.domain_selector.value = "daint.cscs.ch"
     w.comp_resources_database.computer_selector.value = "mc"
-    w.comp_resources_database.code_selector.value = "QE-7.2-exe-template"
+    w.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.2"
 
     # Test before the template is filled, the warning message is displayed.
     w._on_quick_setup()
@@ -591,7 +591,7 @@ def test_resource_setup_widget_for_password_configure(monkeypatch, tmp_path):
     # and the computer/code setup widget will be updated accordingly.
     w.comp_resources_database.domain_selector.value = "merlin.psi.ch"
     w.comp_resources_database.computer_selector.value = "cpu"
-    w.comp_resources_database.code_selector.value = "QE-7.0-exe-template"
+    w.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.0"
 
     # Fill in the computer name and trigger the setup button again, the message should be updated.
     for (
@@ -658,7 +658,7 @@ def test_resource_setup_widget_computer_change_code_reset():
     # and the computer/code setup widget will be updated accordingly.
     w.comp_resources_database.domain_selector.value = "daint.cscs.ch"
     w.comp_resources_database.computer_selector.value = "mc"
-    w.comp_resources_database.code_selector.value = "QE-7.2-exe-template"
+    w.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.2"
 
     assert w.template_code._help_text.layout.display == "block"
 
@@ -675,7 +675,7 @@ def test_resource_setup_widget_detailed_setup():
 
     w.comp_resources_database.domain_selector.value = "daint.cscs.ch"
     w.comp_resources_database.computer_selector.value = "mc"
-    w.comp_resources_database.code_selector.value = "pw-7.0"
+    w.comp_resources_database.code_selector.value = "cp2k-9.1"
 
     # Test the detailed setup widget is displayed with the label updated because the
     # information can get from the default of the template variables.
@@ -742,7 +742,7 @@ def test_computer_resource_setup_widget_default(monkeypatch, tmp_path):
 
     w_resource.comp_resources_database.domain_selector.value = "merlin.psi.ch"
     w_resource.comp_resources_database.computer_selector.value = "cpu"
-    w_resource.comp_resources_database.code_selector.value = "QE-7.0-exe-template"
+    w_resource.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.0"
 
     # Fill in the computer name and trigger the setup button again, the message should be updated.
     for (

diff --git a/tests_notebooks/test_notebooks.py b/tests_notebooks/test_notebooks.py
@@ -114,7 +114,7 @@ def test_computational_resources_code_setup(
     selenium_driver, aiidalab_exec, final_screenshot
 ):
     """Test the quicksetup of the code"""
-    # check the code cp2k is not in code list
+    # check the code CP2K is not in code list
     output = aiidalab_exec("verdi code list").decode().strip()
     assert "cp2k" not in output
 
@@ -148,6 +148,6 @@ def test_computational_resources_code_setup(
     ).click()
     time.sleep(1.0)
 
-    # check the new code pw-7.0@daint-mc is in code list
+    # check the new code cp2k-9.1@daint-mc is in code list
     output = aiidalab_exec("verdi code list").decode().strip()
     assert "cp2k-9.1@daint-mc" in output