test: Remove special handling for golang client

See:
* mendersoftware/mender-image-tests@7f390bf

Ticket: QA-1453

Signed-off-by: Lluis Campos <lluis.campos@northern.tech>

Author: lluiscampos

tests/acceptance/commercial/test_delta_update_module.py

@@ -35,7 +35,7 @@
 
 @pytest.mark.cross_platform
 @pytest.mark.commercial
-@pytest.mark.min_mender_version("2.1.0")
+@pytest.mark.min_mender_version("4.0.0")
 class TestDeltaUpdateModule:
     @pytest.mark.only_with_image("ext4")
     def test_build_module(
@@ -75,7 +75,6 @@ def do_install_mender_binary_delta(
         bitbake_variables,
         bitbake_image,
         connection,
-        mender_update_binary,
         http_server,
         board_type,
         use_s3,
@@ -97,19 +96,13 @@ def do_install_mender_binary_delta(
         )
 
         Helpers.install_update(
-            image,
-            connection,
-            mender_update_binary,
-            http_server,
-            board_type,
-            use_s3,
-            s3_address,
+            image, connection, http_server, board_type, use_s3, s3_address,
         )
 
         reboot(connection)
 
         run_after_connect("true", connection)
-        connection.run(f"{mender_update_binary} commit")
+        connection.run("mender-update commit")
 
         return image
 
@@ -123,7 +116,6 @@ def test_runtime_checksum(
         bitbake_image,
         bitbake_path,
         connection,
-        mender_update_binary,
         http_server,
         board_type,
         use_s3,
@@ -145,7 +137,6 @@ def test_runtime_checksum(
             bitbake_variables,
             bitbake_image,
             connection,
-            mender_update_binary,
             http_server,
             board_type,
             use_s3,
@@ -181,7 +172,6 @@ def test_perform_update(
         bitbake_image,
         bitbake_path,
         connection,
-        mender_update_binary,
         http_server,
         board_type,
         use_s3,
@@ -204,7 +194,6 @@ def test_perform_update(
             bitbake_variables,
             bitbake_image,
             connection,
-            mender_update_binary,
             http_server,
             board_type,
             use_s3,
@@ -242,7 +231,7 @@ def test_perform_update(
             )
 
             # Verbose provides/depends of the different Artifacts and the client (when supported)
-            connection.run(f"{mender_update_binary} show-provides", warn=True)
+            connection.run("mender-update show-provides", warn=True)
             subprocess.check_call(
                 "mender-artifact read %s" % artifact_from, shell=True,
             )
@@ -258,13 +247,7 @@ def test_perform_update(
                 bitbake_variables, connection
             )
             Helpers.install_update(
-                artifact_delta,
-                connection,
-                mender_update_binary,
-                http_server,
-                board_type,
-                use_s3,
-                s3_address,
+                artifact_delta, connection, http_server, board_type, use_s3, s3_address,
             )
             reboot(connection)
             run_after_connect("true", connection)
@@ -273,4 +256,4 @@ def test_perform_update(
             )
             assert new_active == passive
             assert new_passive == active
-            connection.run(f"{mender_update_binary} commit")
+            connection.run("mender-update commit")

tests/acceptance/image-tests

@@ -109,11 +109,11 @@ def boot_device_with_bootstrap_image(
 
 
 @pytest.mark.cross_platform
-@pytest.mark.min_mender_version("3.5.0")
+@pytest.mark.min_mender_version("4.0.0")
 @pytest.mark.min_yocto_version("dunfell")
 @pytest.mark.only_with_image("ext4", "ext3", "ext2")
 def test_bootstrap_artifact_install(
-    request, boot_device_with_bootstrap_image, connection, mender_update_binary
+    request, boot_device_with_bootstrap_image, connection
 ):
     """Test that the Mender Bootstrap Artifact works correctly
 
@@ -138,16 +138,12 @@ def test_bootstrap_artifact_install(
         )
 
     # Check that the database of the client has been populated
-    device_provides = connection.run(
-        f"{mender_update_binary} show-provides"
-    ).stdout.strip()
+    device_provides = connection.run("mender-update show-provides").stdout.strip()
     assert "rootfs-image.checksum" in device_provides
     assert "rootfs-image.version" in device_provides
 
     # Verify that no errors occured during the install (in which case the artifact-name would be uknown)
-    show_artifact = connection.run(
-        f"{mender_update_binary} show-artifact"
-    ).stdout.strip()
+    show_artifact = connection.run("mender-update show-artifact").stdout.strip()
     assert (
         show_artifact != "unknown"
     ), "There were errors installing the Bootstrap Artifact"

tests/acceptance/test_bootstrap_artifact.py

@@ -1239,14 +1239,9 @@ def test_mender_inventory_network_scripts(
         ), "mender-inventory-network-scripts unexpectedly a part of the image"
 
     @pytest.mark.cross_platform
-    @pytest.mark.min_mender_version("2.7.0")
+    @pytest.mark.min_mender_version("4.0.0")
     def test_mender_dbus_interface_file(
-        self,
-        request,
-        prepared_test_build,
-        bitbake_image,
-        bitbake_path,
-        mender_update_binary,
+        self, request, prepared_test_build, bitbake_image, bitbake_path,
     ):
         """
         Test that the D-Bus interface files are provided by the mender-client-dev package,

tests/acceptance/test_build.py

@@ -44,27 +44,22 @@ def test_dbus_system_configuration_file(self, bitbake_variables, connection):
         ).stdout.strip()
         assert "io.mender.AuthenticationManager" in output
 
-    @pytest.mark.min_mender_version("2.5.0")
+    @pytest.mark.min_mender_version("4.0.0")
     def test_dbus_non_root_access(
-        self,
-        request,
-        bitbake_variables,
-        connection,
-        mender_auth_binary,
-        mender_auth_service,
+        self, request, bitbake_variables, connection,
     ):
         """Test that only root user can access Mender DBus API."""
 
         # This is the command that is expected to fail for non-root user
         dbus_send_command = "dbus-send --system --dest=io.mender.AuthenticationManager --print-reply /io/mender/AuthenticationManager io.mender.Authentication1.GetJwtToken"
 
         try:
-            connection.run(f"{mender_auth_binary} bootstrap", warn=True)
-            connection.run(f"systemctl start {mender_auth_service}")
+            connection.run("mender-auth bootstrap", warn=True)
+            connection.run("systemctl start mender-authd")
 
             # Wait one state machine cycle for the D-Bus API to be available
             for _ in range(60):
-                result = connection.run(f"journalctl --unit {mender_auth_service}")
+                result = connection.run("journalctl --unit mender-authd")
                 if (
                     "Authorize failed:" in result.stdout
                     or "Failed to authorize" in result.stdout
@@ -88,23 +83,17 @@ def test_dbus_non_root_access(
             ), result.stderr
 
         finally:
-            connection.run(f"systemctl stop {mender_auth_service}")
+            connection.run("systemctl stop mender-authd")
             cleanup_mender_state(request, connection)
 
-    @pytest.mark.min_mender_version("2.5.0")
+    @pytest.mark.min_mender_version("4.0.0")
     def test_dbus_fetch_jwt_token(
-        self,
-        request,
-        bitbake_variables,
-        connection,
-        setup_mock_server,
-        mender_auth_binary,
-        mender_auth_service,
+        self, request, bitbake_variables, connection, setup_mock_server,
     ):
         """Test that the JWT token can be fetched using D-Bus."""
 
         # bootstrap the auth service
-        result = connection.run(f"{mender_auth_binary} bootstrap --forcebootstrap")
+        result = connection.run("mender-auth bootstrap --forcebootstrap")
         assert result.exited == 0
 
         try:
@@ -117,7 +106,7 @@ def test_dbus_fetch_jwt_token(
             # get the JWT token via D-Bus
             try:
                 # start the mender-auth service
-                result = connection.run(f"systemctl start {mender_auth_service}")
+                result = connection.run("systemctl start mender-authd")
                 assert result.exited == 0
 
                 # fetch the JWT token
@@ -163,7 +152,7 @@ def test_dbus_fetch_jwt_token(
 
             finally:
                 p.terminate()
-                connection.run(f"systemctl stop {mender_auth_service}")
+                connection.run("systemctl stop mender-authd")
                 connection.run("rm -f /tmp/dbus-monitor.log")
 
         finally:

tests/acceptance/test_dbus.py

@@ -246,29 +246,22 @@ def test_volumes(self, bitbake_variables, ubimg_without_uboot_env):
         assert int(ubinfo["rootfsa"]["ubinize"]["vol_size"]) <= 1.02 * rootfs_size
         assert int(ubinfo["rootfsb"]["ubinize"]["vol_size"]) <= 1.02 * rootfs_size
 
+    @pytest.mark.min_mender_version("4.0.0")
     def test_volume_contents(
-        self,
-        bitbake_variables,
-        mender_auth_binary,
-        mender_update_binary,
-        ubimg_without_uboot_env,
+        self, bitbake_variables, ubimg_without_uboot_env,
     ):
         """Test that data volume has correct contents"""
 
         with make_tempdir() as tmpdir:
             rootdir = extract_ubimg_files(ubimg_without_uboot_env, tmpdir)
 
+            assert os.path.exists(os.path.join(rootdir, "rootfsa/usr/bin/mender-auth"))
+            assert os.path.exists(os.path.join(rootdir, "rootfsb/usr/bin/mender-auth"))
             assert os.path.exists(
-                os.path.join(rootdir, f"rootfsa/usr/bin/{mender_auth_binary}")
+                os.path.join(rootdir, "rootfsa/usr/bin/mender-update")
             )
             assert os.path.exists(
-                os.path.join(rootdir, f"rootfsb/usr/bin/{mender_auth_binary}")
-            )
-            assert os.path.exists(
-                os.path.join(rootdir, f"rootfsa/usr/bin/{mender_update_binary}")
-            )
-            assert os.path.exists(
-                os.path.join(rootdir, f"rootfsb/usr/bin/{mender_update_binary}")
+                os.path.join(rootdir, "rootfsb/usr/bin/mender-update")
             )
             # TODO: verify contents of data partition