Merge pull request #2013 from plotly/fix-html-gen

Fix html generation

Author: alexcjohnson

components/dash-html-components/scripts/data/attributes.json

@@ -417,12 +417,6 @@
             ],
             "description": "Indicates the upper bound of the lower range."
         },
-        "manifest": {
-            "elements": [
-                "html"
-            ],
-            "description": "Specifies the URL of the document's cache manifest. Note: This attribute is obsolete, use <link rel=\"manifest\"> instead."
-        },
         "max": {
             "elements": [
                 "input",
@@ -511,7 +505,7 @@
                 "details",
                 "dialog"
             ],
-            "description": "Indicates whether the the contents are currently visible (in the case of a <details> element) or whether the dialog is active and can be interacted with (in the case of a <dialog> element)."
+            "description": "Indicates whether the contents are currently visible (in the case of a <details> element) or whether the dialog is active and can be interacted with (in the case of a <dialog> element)."
         },
         "optimum": {
             "elements": [
@@ -591,6 +585,12 @@
             ],
             "description": "Indicates whether the list should be displayed in a descending order instead of a ascending."
         },
+        "role": {
+            "elements": [
+                "Globalattribute"
+            ],
+            "description": "Defines an explicit role for an element for use by assistive technologies."
+        },
         "rows": {
             "elements": [
                 "textarea"
@@ -616,12 +616,6 @@
             ],
             "description": "Defines the cells that the header test (defined in the th element) relates to."
         },
-        "scoped": {
-            "elements": [
-                "style"
-            ],
-            "description": ""
-        },
         "selected": {
             "elements": [
                 "option"
@@ -714,12 +708,6 @@
             ],
             "description": "Defines CSS styles which will override styles previously set."
         },
-        "summary": {
-            "elements": [
-                "table"
-            ],
-            "description": ""
-        },
         "tabIndex": {
             "elements": [
                 "Globalattribute"
@@ -852,6 +840,7 @@
             "hidden",
             "id",
             "lang",
+            "role",
             "spellCheck",
             "style",
             "tabIndex",
@@ -1110,9 +1099,6 @@
         "marquee": [
             "loop"
         ],
-        "html": [
-            "manifest"
-        ],
         "source": [
             "media",
             "sizes",
@@ -1122,7 +1108,6 @@
         ],
         "style": [
             "media",
-            "scoped",
             "type"
         ],
         "map": [
@@ -1148,9 +1133,6 @@
         "colgroup": [
             "span"
         ],
-        "table": [
-            "summary"
-        ],
         "menu": [
             "type"
         ],

components/dash-html-components/scripts/generate-components.js

@@ -145,11 +145,6 @@ function generatePropTypes(element, attributes) {
      */
     'key': PropTypes.string,
 
-    /**
-     * The ARIA role attribute
-     */
-    'role': PropTypes.string,
-
     /**
      * A wildcard data attribute
      */

dash/testing/application_runners.py

@@ -12,7 +12,12 @@
 import runpy
 import requests
 
-from dash.testing.errors import NoAppFoundError, TestingTimeoutError, ServerCloseError
+from dash.testing.errors import (
+    NoAppFoundError,
+    TestingTimeoutError,
+    ServerCloseError,
+    DashAppLoadingError,
+)
 from dash.testing import wait
 
 
@@ -146,37 +151,51 @@ def _handle_error():
 
         app.server.errorhandler(500)(_handle_error)
 
+        if self.thread and self.thread.is_alive():
+            self.stop()
+
         def run():
             app.scripts.config.serve_locally = True
             app.css.config.serve_locally = True
+
+            options = kwargs.copy()
+
             if "port" not in kwargs:
-                kwargs["port"] = self.port = BaseDashRunner._next_port
+                options["port"] = self.port = BaseDashRunner._next_port
                 BaseDashRunner._next_port += 1
             else:
-                self.port = kwargs["port"]
+                self.port = options["port"]
 
             try:
-                app.run_server(threaded=True, **kwargs)
+                app.run_server(threaded=True, **options)
             except SystemExit:
                 logger.info("Server stopped")
 
-        self.thread = KillerThread(target=run)
-        self.thread.daemon = True
-        try:
-            self.thread.start()
-        except RuntimeError:  # multiple call on same thread
-            logger.exception("threaded server failed to start")
-            self.started = False
+        retries = 0
 
-        self.started = self.thread.is_alive()
+        while not self.started and retries < 3:
+            try:
+                self.thread = KillerThread(target=run)
+                self.thread.daemon = True
+                self.thread.start()
+                # wait until server is able to answer http request
+                wait.until(lambda: self.accessible(self.url), timeout=2)
+                self.started = self.thread.is_alive()
+            except Exception as err:  # pylint: disable=broad-except
+                logger.exception(err)
+                self.started = False
+                retries += 1
+                BaseDashRunner._next_port += 1
 
-        # wait until server is able to answer http request
-        wait.until(lambda: self.accessible(self.url), timeout=1)
+        self.started = self.thread.is_alive()
+        if not self.started:
+            raise DashAppLoadingError("threaded server failed to start")
 
     def stop(self):
         self.thread.kill()
         self.thread.join()
         wait.until_not(self.thread.is_alive, self.stop_timeout)
+        self.started = False
 
 
 class ProcessRunner(BaseDashRunner):