moreIconsDialog-accesses-internet

Gbp-Pq: Name moreIconsDialog-accesses-internet.diff

diff --git a/sw/qa/uitest/options/optionsDialog.py b/sw/qa/uitest/options/optionsDialog.py
index 790d30c9b7ed8360f4cac140dbd8af528eec9c9a..f91684a7ad3fce249c11e2b92d9bb2ea727955bc 100644 (file)
--- a/sw/qa/uitest/options/optionsDialog.py
+++ b/sw/qa/uitest/options/optionsDialog.py
@@ -7,27 +7,32 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
+import os
 
 class optionsDialog(UITestCase):
 
+    # does network access (checks extensions.libreoffice.org), so disable it in "standard" make check
+    # but allow it on autopkgtest which has the needs-internet restriction
     def test_moreIconsDialog(self):
-        with self.ui_test.create_doc_in_start_center("writer"):
-
-            with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
+        if "AUTOPKGTEST_TMP" in os.environ:
+            with self.ui_test.create_doc_in_start_center("writer"):
 
-                xPages = xDialog.getChild("pages")
-                xLOEntry = xPages.getChild('0')
-                xLOEntry.executeAction("EXPAND", tuple())
-                xViewEntry = xLOEntry.getChild('2')
-                xViewEntry.executeAction("SELECT", tuple())
+                with self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") as xDialog:
 
-                xMoreIconsBtn = xDialog.getChild("btnMoreIcons")
+                    xPages = xDialog.getChild("pages")
+                    xLOEntry = xPages.getChild('0')
+                    xLOEntry.executeAction("EXPAND", tuple())
+                    xViewEntry = xLOEntry.getChild('2')
+                    xViewEntry.executeAction("SELECT", tuple())
 
-                with self.ui_test.execute_blocking_action(xMoreIconsBtn.executeAction, args=('CLICK', ()), close_button="buttonClose") as dialog:
-                    # Check it doesn't crash while opening it
-                    xCloseBtn = dialog.getChild("buttonClose")
-                    self.ui_test.wait_until_property_is_updated(xCloseBtn, "Enabled", "true")
+                    xMoreIconsBtn = xDialog.getChild("btnMoreIcons")
 
+                    with self.ui_test.execute_blocking_action(xMoreIconsBtn.executeAction, args=('CLICK', ()), close_button="buttonClose") as dialog:
+                        # Check it doesn't crash while opening it
+                        xCloseBtn = dialog.getChild("buttonClose")
+                        self.ui_test.wait_until_property_is_updated(xCloseBtn, "Enabled", "true")
+        else:
+                print("Skipped")
 
 
     def test_tdf138596(self):