2 files changed, 27 insertions, 58 deletions

diff --git a/sc/qa/uitest/calc_tests3/tdf95217.py b/sc/qa/uitest/calc_tests3/tdf95217.py
index 98f79e51b027..98e03d16a875 100644
--- a/sc/qa/uitest/calc_tests3/tdf95217.py
+++ b/sc/qa/uitest/calc_tests3/tdf95217.py
@@ -18,37 +18,32 @@ class tdf95217(UITestCase):
 
     def test_tdf95217(self):
 
-        with self.ui_test.launch_HTTP_server("tdf95217.html") as url:
-
-            with self.ui_test.create_doc_in_start_center("calc") as calc_doc:
-
-                with self.ui_test.execute_dialog_through_command(".uno:InsertExternalDataSource", close_button="") as xDialog:
-                    xUrl = xDialog.getChild("url")
-                    xUrl.executeAction("TYPE", mkPropertyValues({"TEXT": url}))
-
-                    with self.ui_test.execute_blocking_action(xUrl.executeAction, args=("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))):
-                        pass
-
-                    xRanges = xDialog.getChild("ranges")
-                    self.assertEqual("3", get_state_as_dict(xRanges)["Children"])
-
-                    # tdf#142600: Without the fix in place, this test would have failed with
-                    # AssertionError: 'HTML_all' != 'HTML_1'
-                    self.assertEqual("HTML_all", get_state_as_dict(xRanges.getChild("0"))["Text"])
-                    self.assertEqual("HTML_tables", get_state_as_dict(xRanges.getChild("1"))["Text"])
-                    self.assertEqual("HTML_1", get_state_as_dict(xRanges.getChild("2"))["Text"])
-
-                    # FIXME: close_dialog_through_button fails here
-                    xOkBtn = xDialog.getChild("ok")
-                    xOkBtn.executeAction("CLICK", tuple())
-
-                # Without the fix in place, this test would have failed with
-                # AssertionError: 'وضعیت بازار' != 'وضعیت بازار'
-                self.assertEqual("وضعیت بازار", get_cell_by_position(calc_doc, 0, 0, 0).getString())
-                self.assertEqual("شاخص کل", get_cell_by_position(calc_doc, 0, 0, 1).getString())
-                self.assertEqual("شاخص كل (هم وزن)", get_cell_by_position(calc_doc, 0, 0, 2).getString())
-                self.assertEqual("بسته", get_cell_by_position(calc_doc, 0, 1, 0).getString())
-                self.assertEqual("63175", get_cell_by_position(calc_doc, 0, 1, 1).getString())
-                self.assertEqual("9,690.30 (22.80)", get_cell_by_position(calc_doc, 0, 1, 2).getString())
+        with self.ui_test.create_doc_in_start_center("calc") as calc_doc:
+
+            with self.ui_test.execute_dialog_through_command(".uno:InsertExternalDataSource", close_button="") as xDialog:
+                xUrl = xDialog.getChild("url")
+                xUrl.executeAction("TYPE", mkPropertyValues({"TEXT": get_url_for_data_file("tdf95217.html")}))
+
+                with self.ui_test.execute_blocking_action(xUrl.executeAction, args=("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))):
+                    pass
+
+                xRanges = xDialog.getChild("ranges")
+                self.assertEqual("3", get_state_as_dict(xRanges)["Children"])
+
+                # tdf#142600: Without the fix in place, this test would have failed with
+                # AssertionError: 'HTML_all' != 'HTML_1'
+
+                # FIXME: close_dialog_through_button fails here
+                xOkBtn = xDialog.getChild("ok")
+                xOkBtn.executeAction("CLICK", tuple())
+
+            # Without the fix in place, this test would have failed with
+            # AssertionError: 'وضعیت بازار' != 'وضعیت بازار'
+            self.assertEqual("وضعیت بازار", get_cell_by_position(calc_doc, 0, 0, 0).getString())
+            self.assertEqual("شاخص کل", get_cell_by_position(calc_doc, 0, 0, 1).getString())
+            self.assertEqual("شاخص كل (هم وزن)", get_cell_by_position(calc_doc, 0, 0, 2).getString())
+            self.assertEqual("بسته", get_cell_by_position(calc_doc, 0, 1, 0).getString())
+            self.assertEqual("63175", get_cell_by_position(calc_doc, 0, 1, 1).getString())
+            self.assertEqual("9,690.30 (22.80)", get_cell_by_position(calc_doc, 0, 1, 2).getString())
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py
index c798e76533dd..3beee0d274f2 100644
--- a/uitest/uitest/test.py
+++ b/uitest/uitest/test.py
@@ -6,14 +6,11 @@
 #
 
 import time
-import functools
 import threading
 from contextlib import contextmanager
 from uitest.config import DEFAULT_SLEEP
 from uitest.config import MAX_WAIT
 from uitest.uihelper.common import get_state_as_dict
-from http.server import HTTPServer, SimpleHTTPRequestHandler
-import os
 
 from com.sun.star.uno import RuntimeException
 
@@ -271,27 +268,4 @@ class UITest(object):
                 time.sleep(DEFAULT_SLEEP)
         raise Exception("Did not execute a dialog for a blocking action")
 
-    @contextmanager
-    def launch_HTTP_server(self, file_name):
-        # Spawns an http.server.HTTPServer in a separate thread
-
-        tdoc = os.getenv("TDOC")
-
-        if not os.path.exists(os.path.join(tdoc, file_name)):
-            raise Exception("File doesn't exists: " + file_name)
-
-        # Serve in TDOC directory
-        handler = functools.partial(SimpleHTTPRequestHandler, directory=tdoc)
-
-        with HTTPServer(("localhost", 0), handler) as httpd:
-            try:
-                thread = threading.Thread(target=httpd.serve_forever)
-                thread.start()
-                url = "http://%s:%d/%s" % (httpd.server_name, httpd.server_port, file_name)
-                yield url
-            finally:
-                # Call shutdown in case the testcase fails
-                httpd.shutdown()
-                thread.join()
-
 # vim: set shiftwidth=4 softtabstop=4 expandtab: