tests: merlin.psi.ch -> merlin7.psi.sh

Author: danielhollas

tests/test_computational_resources.py

@@ -593,9 +593,9 @@ def test_resource_setup_widget_for_password_configure(monkeypatch, tmp_path):
 
     # Test select a new resource setup will update the output interface (e.g. ssh_config, computer_setup, code_setup)
     # and the computer/code setup widget will be updated accordingly.
-    w.comp_resources_database.domain_selector.value = "merlin.psi.ch"
+    w.comp_resources_database.domain_selector.value = "merlin7.psi.ch"
     w.comp_resources_database.computer_selector.value = "cpu"
-    w.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.0"
+    w.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.4"
 
     # Fill in the computer name and trigger the setup button again, the message should be updated.
     for (
@@ -606,7 +606,7 @@ def test_resource_setup_widget_for_password_configure(monkeypatch, tmp_path):
             sub_widget = mapping_variable.widget
 
             # Test the default value is filled in correctly.
-            assert sub_widget.value == "merlin-cpu"
+            assert sub_widget.value == "merlin7-cpu"
 
     # Test the password box is displayed.
     assert w.password_box_container.layout.display == "block"
@@ -648,7 +648,7 @@ def test_resource_setup_widget_for_password_configure(monkeypatch, tmp_path):
 
     assert w.success
     # check the code is really created
-    assert orm.load_code("pw-7.0@merlin-cpu")
+    assert orm.load_code("pw-7.0@merlin7-cpu")
 
     # The key pair will be generated to the temporary directory
     # Check the content of the config is correct
@@ -753,9 +753,9 @@ def test_computer_resource_setup_widget_default(monkeypatch, tmp_path):
 
     w_resource = w.resource_setup
 
-    w_resource.comp_resources_database.domain_selector.value = "merlin.psi.ch"
+    w_resource.comp_resources_database.domain_selector.value = "merlin7.psi.ch"
     w_resource.comp_resources_database.computer_selector.value = "cpu"
-    w_resource.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.0"
+    w_resource.comp_resources_database.code_selector.value = "QuantumESPRESSO-7.4"
 
     # Fill in the computer name and trigger the setup button again, the message should be updated.
     for (
@@ -766,7 +766,7 @@ def test_computer_resource_setup_widget_default(monkeypatch, tmp_path):
             sub_widget = mapping_variable.widget
 
             # Test the default value is filled in correctly.
-            assert sub_widget.value == "merlin-cpu"
+            assert sub_widget.value == "merlin7-cpu"
 
     # Fill the computer configure template variables
     for (
@@ -802,10 +802,10 @@ def test_computer_resource_setup_widget_default(monkeypatch, tmp_path):
 
     assert w_resource.success
     # check the code is really created
-    assert orm.load_code("pw-7.0@merlin-cpu")
+    assert orm.load_code("pw-7.0@merlin7-cpu")
 
     # check the dropdown is updated
-    assert "pw-7.0@merlin-cpu" in [c[0] for c in w.code_select_dropdown.options]
+    assert "pw-7.0@merlin7-cpu" in [c[0] for c in w.code_select_dropdown.options]
 
     # The key pair will be generated to the temporary directory
     # Check the content of the config is correct

tests/test_databases.py

@@ -51,7 +51,7 @@ def test_computational_resources_database_widget():
     # Same for the quick setup widget.
     widget = ComputationalResourcesDatabaseWidget(default_calc_job_plugin="cp2k")
     assert (
-        "merlin.psi.ch" not in widget.database
+        "merlin7.psi.ch" not in widget.database
     )  # Merlin does not have CP2K installed.
 
     # Select computer/code
@@ -104,9 +104,9 @@ def test_resource_database_widget_recognize_template_entry_points():
     widget = ComputationalResourcesDatabaseWidget(
         default_calc_job_plugin="quantumespresso.pw"
     )
-    assert "merlin.psi.ch" in widget.database
+    assert "merlin7.psi.ch" in widget.database
 
     widget = ComputationalResourcesDatabaseWidget(
         default_calc_job_plugin="quantumespresso.ph"
     )
-    assert "merlin.psi.ch" in widget.database
+    assert "merlin7.psi.ch" in widget.database