Bug 2031290 - Enterprise: PackageKit DBus handling for Updates

Author: Alexandre Lissy

browser/components/enterprise/modules/Updates.sys.mjs

@@ -185,6 +185,9 @@ export const Updates = {
           );
         }
 
+        lazy.log.warn(
+          `FeltUpdates: appUpdaterCallback: STATUS.DOWNLOADING: downloadedBytes:${downloadedBytes} totalBytes:${totalBytes} => percent:${percent}`
+        );
         this._document.querySelector("#felt-updates-progress").value = percent;
         break;
       }

python/sites/mach.txt

@@ -56,6 +56,7 @@ pth:tools/moztreedocs
 pth:xpcom/ds/tools
 pth:xpcom/geckoprocesstypes_generator
 pth:xpcom/idl-parser
+pypi-optional:dbus-python==1.3.2:linux
 # glean-sdk may not be installable if a wheel isn't available
 # and it has to be built from source.
 pypi-optional:glean-sdk==67.3.2:telemetry will not be collected
@@ -64,6 +65,7 @@ pypi-optional:orjson>=3.10:json operations will be slower in various tools
 # We aren't (yet) able to pin packages in automation, so we have to
 # support down to the oldest locally-installed version (5.4.2).
 pypi-optional:psutil>=5.4.2:telemetry will be missing some data
+pypi-optional:python-dbusmock==0.32.2:linux
 pypi-optional:rtoml>=0.11.0:toml operations will be slower in various tools
 pypi-optional:zstandard>=0.11.1,<=0.25.0:zstd archives will not be possible to extract
 vendored-fallback:pyyaml:third_party/python/pyyaml/lib/:faster native loading is disabled

taskcluster/kinds/test/kind.yml

@@ -92,4 +92,5 @@ task-defaults:
                 default:
                     - linux64-minidump-stackwalk
                     - linux64-fix-stacks
+                    - linux-python-dbusmock
                     - linux64-2404-dbus-python

taskcluster/kinds/test/marionette.yml

@@ -22,7 +22,6 @@ task-defaults:
                     - marionette/windows_taskcluster_config.py
                 linux.*:
                     - marionette/prod_config.py
-                    - unittests/linux_dbus-python.py
                     - remove_executables.py
                 default:
                     - marionette/prod_config.py
@@ -154,6 +153,11 @@ marionette-enterprise:
                 windows.*:
                     - marionette/windows_taskcluster_config.py
                     - marionette/enterprise_config.py
+                linux.*:
+                    - marionette/prod_config.py
+                    - marionette/enterprise_config.py
+                    - unittests/linux_dbus-python.py
+                    - remove_executables.py
                 default:
                     - marionette/prod_config.py
                     - marionette/enterprise_config.py

…ng/enterprise/test_felt_updates_apply.py testing/enterprise/felt_updates.pytesting/enterprise/test_felt_updates_apply.py renamed to testing/enterprise/felt_updates.py testing/enterprise/test_felt_updates_apply.py renamed to testing/enterprise/felt_updates.py

@@ -8,34 +8,12 @@
 import sys
 import time
 
-import mozversion
-import requests
-
 sys.path.append(os.path.dirname(__file__))
 
 from felt_tests import FeltTests
 
 
-class FeltUpdatesApplyFromFelt(FeltTests):
-    EXTRA_PREFS = {
-        "app.update.log": True,
-        "app.update.disabledForTesting": False,
-        "app.update.BITS.enabled": False,
-        "enterprise.felt_tests.is_updates_testing": True,
-        "enterprise.felt_tests.read_update_url_from_prefs": True,
-    }
-
-    def setup(self):
-        self._logger.info("Enabling updates")
-        version_info = mozversion.get_version(binary=self._driver.instance.binary)
-        requests.post(
-            f"http://localhost:{self.console_port}/api/browser/updates",
-            data=version_info,
-        )
-        self._logger.info(f"Version: {version_info}")
-        self._logger.info("Updates ready")
-        super().setup()
-
+class FeltUpdatesBase(FeltTests):
     def get_update_config_file_path(self):
         self._driver.set_context("chrome")
         rv = self._driver.execute_script(
@@ -47,30 +25,55 @@ def get_update_config_file_path(self):
         self._driver.set_context("content")
         return rv
 
-    def test_felt_updates_apply_from_felt(self):
-        self._update_root = os.path.dirname(self.get_update_config_file_path())
+    def get_latest_update_from_history(self):
+        with self._driver.using_context(self._driver.CONTEXT_CHROME):
+            result = self._driver.execute_async_script("""
+            const callback = arguments[arguments.length - 1];
+            Cc["@mozilla.org/updates/update-manager;1"]
+              .getService(Ci.nsIUpdateManager)
+              .getHistory()
+              .then(history => callback(history[0]))
+              .catch(err => callback({ error: err.toString() }));
+            """)
+
+        assert "error" not in result, f"UpdateManager failed: {result.get('error')}"
+        return result
+
+    def assert_latest_update_url(self, state, expected_start, expected_end):
+        update_data = self.get_latest_update_from_history()
+
+        assert update_data is not None, "Update data payload is missing."
+        assert update_data["state"] == state, (
+            f"Update state {update_data['state']} is not the expected state {state}"
+        )
 
-        self._logger.info("Updates ready: running tests")
-        self.run_verify_update_ui()
-        self.run_verify_update_check_run()
-        # This is required since in marionette we use MAR that are not signed
-        # so we cannot reach the real restart point
-        # We also cannot close the window without loosing our Marionette access
-        with self._driver.using_prefs({
-            "enterprise.felt.previousBuildID": "20250701120000"
-        }):
-            self.reload_chrome_window()
-            self.run_verify_update_applied()
+        patch = update_data.get("selectedPatch", {})
+        assert patch is not None, "The update history entry does not contain any patch."
 
-    def teardown(self):
-        self.run_updates_cleanup()
+        url = patch.get("URL")
+        # Split query string that does not matter
+        final_url = patch.get("finalURL").split("?")[0]
 
-        self._logger.info("Disabling updates")
-        requests.post(f"http://localhost:{self.console_port}/api/browser/updates")
+        assert url is not None, "Patch is missing a URL descriptor."
+        assert url == final_url, (
+            f"URL mismatch: '{url}' does not equal finalURL '{final_url}'."
+        )
+        assert url.startswith(expected_start), (
+            f"Expected URL to start with '{expected_start}', but got '{url}'."
+        )
+        assert url.endswith(expected_end), (
+            f"Expected URL to end with '{expected_end}', but got '{url}'."
+        )
 
+    def run_felt_updates_apply(self):
         # We are not going to start the browser so do not try to close it
         self._manually_closed_child = True
-        super().teardown()
+
+        self._update_root = os.path.dirname(self.get_update_config_file_path())
+
+        self._logger.info("Updates ready: running tests")
+        self.run_verify_update_ui()
+        self.run_verify_update_check_run()
 
     def run_verify_update_ui(self):
         self._logger.info("Checking update UI ...")

testing/enterprise/manifest.toml

@@ -52,6 +52,16 @@ run-if = [
   "buildapp == 'browser'", # open new tab
 ]
 
+["test_felt_browser_packagekit_no_firefox_update.py"]
+run-if = [
+  "os == 'linux'",
+]
+
+["test_felt_browser_packagekit_one_firefox_update.py"]
+run-if = [
+  "os == 'linux'",
+]
+
 ["test_felt_browser_rapid_new_tabs_from_cli.py"]
 run-if = [
   "os == 'mac' && buildapp == 'browser'",
@@ -134,7 +144,12 @@ run-if = [
 
 ["test_felt_updater_errors.py"]
 
-["test_felt_updates_apply.py"]
+["test_felt_updates_apply_from_packagekit.py"]
+run-if = [
+  "os == 'linux'",
+]
+
+["test_felt_updates_apply_from_updater.py"]
 
 ["test_felt_updates_basic.py"]