From 8f0108176bf55608b85cd7f043847874cce57bc3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 21 Feb 2019 10:35:51 -0800 Subject: [PATCH] D'oh, move disable_firefox_studies up in utils ...so things that appear earlier in the file can use it. Signed-off-by: Adam Williamson --- lib/utils.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index b9a1127d..9735d284 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -304,6 +304,14 @@ sub menu_launch_type { send_key 'ret'; } +sub disable_firefox_studies { + # create a config file that disables Firefox's dumb 'shield + # studies' so they don't break tests: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1529626 + assert_script_run 'mkdir -p $(rpm --eval %_libdir)/firefox/distribution'; + assert_script_run 'printf \'{"policies": {"DisableFirefoxStudies": true}}\' > $(rpm --eval %_libdir)/firefox/distribution/distribution.ini'; +} + sub start_cockpit { # Starting from a console, get to a browser with Cockpit (running # on localhost) shown. If $login is truth-y, also log in. Assumes @@ -764,11 +772,3 @@ sub advisory_check_nonmatching_packages { } } } - -sub disable_firefox_studies { - # create a config file that disables Firefox's dumb 'shield - # studies' so they don't break tests: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1529626 - assert_script_run 'mkdir -p $(rpm --eval %_libdir)/firefox/distribution'; - assert_script_run 'printf \'{"policies": {"DisableFirefoxStudies": true}}\' > $(rpm --eval %_libdir)/firefox/distribution/distribution.ini'; -}