Bug 1455568 - [wdspec] Refactor folder structure of tests. draft
authorHenrik Skupin <mail@hskupin.info>
Fri, 20 Apr 2018 13:12:53 +0200
changeset 789754 ba2afc256d21c1a0df96d3b8cc4a2b4c59cc7d2e
parent 787142 26e53729a10976f52e75efa44e17b5e054969fec
child 789755 ca0e01ba92eaf712fffb8afb0941615c73cb2e73
push id108337
push userbmo:hskupin@gmail.com
push dateMon, 30 Apr 2018 15:15:02 +0000
bugs1455568
milestone61.0a1
Bug 1455568 - [wdspec] Refactor folder structure of tests. MozReview-Commit-ID: 4FzvhHJ5lQb
testing/web-platform/meta/MANIFEST.json
testing/web-platform/meta/webdriver/tests/add_cookie/add.py.ini
testing/web-platform/meta/webdriver/tests/contexts/maximize_window.py.ini
testing/web-platform/meta/webdriver/tests/cookies/add_cookie.py.ini
testing/web-platform/meta/webdriver/tests/cookies/delete_cookie.py.ini
testing/web-platform/meta/webdriver/tests/cookies/get_named_cookie.py.ini
testing/web-platform/meta/webdriver/tests/delete_cookie/delete.py.ini
testing/web-platform/meta/webdriver/tests/element_clear/clear.py.ini
testing/web-platform/meta/webdriver/tests/element_retrieval/find_element_from_element.py.ini
testing/web-platform/meta/webdriver/tests/element_retrieval/find_elements_from_element.py.ini
testing/web-platform/meta/webdriver/tests/element_retrieval/get_active_element.py.ini
testing/web-platform/meta/webdriver/tests/find_element_from_element/find.py.ini
testing/web-platform/meta/webdriver/tests/find_elements_from_element/find.py.ini
testing/web-platform/meta/webdriver/tests/fullscreen_window.py.ini
testing/web-platform/meta/webdriver/tests/fullscreen_window/fullscreen.py.ini
testing/web-platform/meta/webdriver/tests/get_active_element/get.py.ini
testing/web-platform/meta/webdriver/tests/get_current_url/get.py.ini
testing/web-platform/meta/webdriver/tests/get_element_attribute/get.py.ini
testing/web-platform/meta/webdriver/tests/get_element_property/get.py.ini
testing/web-platform/meta/webdriver/tests/get_element_tag_name/get.py.ini
testing/web-platform/meta/webdriver/tests/get_named_cookie/get.py.ini
testing/web-platform/meta/webdriver/tests/get_title/get.py.ini
testing/web-platform/meta/webdriver/tests/get_window_rect.py.ini
testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini
testing/web-platform/meta/webdriver/tests/interaction/element_clear.py.ini
testing/web-platform/meta/webdriver/tests/is_element_selected/selected.py.ini
testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini
testing/web-platform/meta/webdriver/tests/minimize_window.py.ini
testing/web-platform/meta/webdriver/tests/minimize_window/minimize.py.ini
testing/web-platform/meta/webdriver/tests/navigation/current_url.py.ini
testing/web-platform/meta/webdriver/tests/navigation/get_title.py.ini
testing/web-platform/meta/webdriver/tests/new_session/create_alwaysMatch.py.ini
testing/web-platform/meta/webdriver/tests/new_session/create_firstMatch.py.ini
testing/web-platform/meta/webdriver/tests/new_session/default_values.py.ini
testing/web-platform/meta/webdriver/tests/new_session/invalid_capabilities.py.ini
testing/web-platform/meta/webdriver/tests/new_session/response.py.ini
testing/web-platform/meta/webdriver/tests/sessions/new_session/create_alwaysMatch.py.ini
testing/web-platform/meta/webdriver/tests/sessions/new_session/create_firstMatch.py.ini
testing/web-platform/meta/webdriver/tests/sessions/new_session/default_values.py.ini
testing/web-platform/meta/webdriver/tests/sessions/new_session/invalid_capabilities.py.ini
testing/web-platform/meta/webdriver/tests/sessions/new_session/response.py.ini
testing/web-platform/meta/webdriver/tests/set_window_rect.py.ini
testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini
testing/web-platform/meta/webdriver/tests/state/get_element_attribute.py.ini
testing/web-platform/meta/webdriver/tests/state/get_element_property.py.ini
testing/web-platform/meta/webdriver/tests/state/get_element_tag_name.py.ini
testing/web-platform/meta/webdriver/tests/state/is_element_selected.py.ini
testing/web-platform/tests/webdriver/tests/add_cookie/add.py
testing/web-platform/tests/webdriver/tests/contexts/maximize_window.py
testing/web-platform/tests/webdriver/tests/cookies/add_cookie.py
testing/web-platform/tests/webdriver/tests/cookies/delete_cookie.py
testing/web-platform/tests/webdriver/tests/cookies/get_named_cookie.py
testing/web-platform/tests/webdriver/tests/delete_cookie/delete.py
testing/web-platform/tests/webdriver/tests/document_handling/page_source.py
testing/web-platform/tests/webdriver/tests/element_clear/clear.py
testing/web-platform/tests/webdriver/tests/element_retrieval/__init__.py
testing/web-platform/tests/webdriver/tests/element_retrieval/find_element.py
testing/web-platform/tests/webdriver/tests/element_retrieval/find_element_from_element.py
testing/web-platform/tests/webdriver/tests/element_retrieval/find_elements.py
testing/web-platform/tests/webdriver/tests/element_retrieval/find_elements_from_element.py
testing/web-platform/tests/webdriver/tests/element_retrieval/get_active_element.py
testing/web-platform/tests/webdriver/tests/element_send_keys/content_editable.py
testing/web-platform/tests/webdriver/tests/find_element/find.py
testing/web-platform/tests/webdriver/tests/find_element_from_element/find.py
testing/web-platform/tests/webdriver/tests/find_elements/find.py
testing/web-platform/tests/webdriver/tests/find_elements_from_element/find.py
testing/web-platform/tests/webdriver/tests/fullscreen_window.py
testing/web-platform/tests/webdriver/tests/fullscreen_window/fullscreen.py
testing/web-platform/tests/webdriver/tests/get_active_element/get.py
testing/web-platform/tests/webdriver/tests/get_current_url/get.py
testing/web-platform/tests/webdriver/tests/get_element_attribute/get.py
testing/web-platform/tests/webdriver/tests/get_element_property/get.py
testing/web-platform/tests/webdriver/tests/get_element_tag_name/get.py
testing/web-platform/tests/webdriver/tests/get_element_text/get.py
testing/web-platform/tests/webdriver/tests/get_named_cookie/get.py
testing/web-platform/tests/webdriver/tests/get_timeouts/get.py
testing/web-platform/tests/webdriver/tests/get_title/get.py
testing/web-platform/tests/webdriver/tests/get_window_rect.py
testing/web-platform/tests/webdriver/tests/get_window_rect/get.py
testing/web-platform/tests/webdriver/tests/interaction/element_clear.py
testing/web-platform/tests/webdriver/tests/interaction/send_keys_content_editable.py
testing/web-platform/tests/webdriver/tests/is_element_selected/selected.py
testing/web-platform/tests/webdriver/tests/maximize_window/maximize.py
testing/web-platform/tests/webdriver/tests/minimize_window.py
testing/web-platform/tests/webdriver/tests/minimize_window/minimize.py
testing/web-platform/tests/webdriver/tests/navigation/current_url.py
testing/web-platform/tests/webdriver/tests/navigation/get_title.py
testing/web-platform/tests/webdriver/tests/new_session/conftest.py
testing/web-platform/tests/webdriver/tests/new_session/create_alwaysMatch.py
testing/web-platform/tests/webdriver/tests/new_session/create_firstMatch.py
testing/web-platform/tests/webdriver/tests/new_session/default_values.py
testing/web-platform/tests/webdriver/tests/new_session/invalid_capabilities.py
testing/web-platform/tests/webdriver/tests/new_session/merge.py
testing/web-platform/tests/webdriver/tests/new_session/response.py
testing/web-platform/tests/webdriver/tests/new_session/support/__init__.py
testing/web-platform/tests/webdriver/tests/new_session/support/create.py
testing/web-platform/tests/webdriver/tests/page_source/source.py
testing/web-platform/tests/webdriver/tests/sessions/get_timeouts.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/conftest.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/create_firstMatch.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/default_values.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/invalid_capabilities.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/merge.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/response.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/support/__init__.py
testing/web-platform/tests/webdriver/tests/sessions/new_session/support/create.py
testing/web-platform/tests/webdriver/tests/sessions/status.py
testing/web-platform/tests/webdriver/tests/set_window_rect.py
testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
testing/web-platform/tests/webdriver/tests/state/__init__.py
testing/web-platform/tests/webdriver/tests/state/get_element_attribute.py
testing/web-platform/tests/webdriver/tests/state/get_element_property.py
testing/web-platform/tests/webdriver/tests/state/get_element_tag_name.py
testing/web-platform/tests/webdriver/tests/state/is_element_selected.py
testing/web-platform/tests/webdriver/tests/state/text/__init__.py
testing/web-platform/tests/webdriver/tests/state/text/get_text.py
testing/web-platform/tests/webdriver/tests/status/status.py
testing/web-platform/tests/webdriver/tests/switch_to_parent_frame.py
testing/web-platform/tests/webdriver/tests/switch_to_parent_frame/switch.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -296456,57 +296456,42 @@
      {}
     ]
    ],
    "webdriver/tests/element_click/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/__init__.py": [
-    [
-     {}
-    ]
-   ],
    "webdriver/tests/element_send_keys/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/execute_async_script/__init__.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/execute_script/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/conftest.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/support/__init__.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/support/create.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/state/__init__.py": [
-    [
-     {}
-    ]
-   ],
-   "webdriver/tests/state/text/__init__.py": [
+   "webdriver/tests/new_session/conftest.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/support/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/support/create.py": [
     [
      {}
     ]
    ],
    "webdriver/tests/support/__init__.py": [
     [
      {}
     ]
@@ -393704,60 +393689,48 @@
    "webdriver/tests/actions/special_keys.py": [
     [
      "/webdriver/tests/actions/special_keys.py",
      {
       "timeout": "long"
      }
     ]
    ],
+   "webdriver/tests/add_cookie/add.py": [
+    [
+     "/webdriver/tests/add_cookie/add.py",
+     {}
+    ]
+   ],
    "webdriver/tests/contexts/json_serialize_windowproxy.py": [
     [
      "/webdriver/tests/contexts/json_serialize_windowproxy.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/contexts/maximize_window.py": [
-    [
-     "/webdriver/tests/contexts/maximize_window.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
    "webdriver/tests/contexts/resizing_and_positioning.py": [
     [
      "/webdriver/tests/contexts/resizing_and_positioning.py",
      {}
     ]
    ],
-   "webdriver/tests/cookies/add_cookie.py": [
-    [
-     "/webdriver/tests/cookies/add_cookie.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/cookies/delete_cookie.py": [
-    [
-     "/webdriver/tests/cookies/delete_cookie.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/cookies/get_named_cookie.py": [
-    [
-     "/webdriver/tests/cookies/get_named_cookie.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/document_handling/page_source.py": [
-    [
-     "/webdriver/tests/document_handling/page_source.py",
-     {}
+   "webdriver/tests/delete_cookie/delete.py": [
+    [
+     "/webdriver/tests/delete_cookie/delete.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/element_clear/clear.py": [
+    [
+     "/webdriver/tests/element_clear/clear.py",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webdriver/tests/element_click/bubbling.py": [
     [
      "/webdriver/tests/element_click/bubbling.py",
      {}
     ]
    ],
@@ -393768,43 +393741,19 @@
     ]
    ],
    "webdriver/tests/element_click/stale.py": [
     [
      "/webdriver/tests/element_click/stale.py",
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/find_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/find_element_from_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_element_from_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/find_elements.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_elements.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/find_elements_from_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/find_elements_from_element.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/element_retrieval/get_active_element.py": [
-    [
-     "/webdriver/tests/element_retrieval/get_active_element.py",
+   "webdriver/tests/element_send_keys/content_editable.py": [
+    [
+     "/webdriver/tests/element_send_keys/content_editable.py",
      {}
     ]
    ],
    "webdriver/tests/element_send_keys/form_controls.py": [
     [
      "/webdriver/tests/element_send_keys/form_controls.py",
      {}
     ]
@@ -393846,171 +393795,219 @@
     ]
    ],
    "webdriver/tests/execute_script/user_prompts.py": [
     [
      "/webdriver/tests/execute_script/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/fullscreen_window.py": [
-    [
-     "/webdriver/tests/fullscreen_window.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/get_window_rect.py": [
-    [
-     "/webdriver/tests/get_window_rect.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/interaction/element_clear.py": [
-    [
-     "/webdriver/tests/interaction/element_clear.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/interaction/send_keys_content_editable.py": [
-    [
-     "/webdriver/tests/interaction/send_keys_content_editable.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/minimize_window.py": [
-    [
-     "/webdriver/tests/minimize_window.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/navigation/current_url.py": [
-    [
-     "/webdriver/tests/navigation/current_url.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/navigation/get_title.py": [
-    [
-     "/webdriver/tests/navigation/get_title.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/get_timeouts.py": [
-    [
-     "/webdriver/tests/sessions/get_timeouts.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
-    [
-     "/webdriver/tests/sessions/new_session/create_alwaysMatch.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/create_firstMatch.py": [
-    [
-     "/webdriver/tests/sessions/new_session/create_firstMatch.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/default_values.py": [
-    [
-     "/webdriver/tests/sessions/new_session/default_values.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/invalid_capabilities.py": [
-    [
-     "/webdriver/tests/sessions/new_session/invalid_capabilities.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/merge.py": [
-    [
-     "/webdriver/tests/sessions/new_session/merge.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/new_session/response.py": [
-    [
-     "/webdriver/tests/sessions/new_session/response.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/sessions/status.py": [
-    [
-     "/webdriver/tests/sessions/status.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/set_window_rect.py": [
-    [
-     "/webdriver/tests/set_window_rect.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/get_element_attribute.py": [
-    [
-     "/webdriver/tests/state/get_element_attribute.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/get_element_property.py": [
-    [
-     "/webdriver/tests/state/get_element_property.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/get_element_tag_name.py": [
-    [
-     "/webdriver/tests/state/get_element_tag_name.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/is_element_selected.py": [
-    [
-     "/webdriver/tests/state/is_element_selected.py",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "webdriver/tests/state/text/get_text.py": [
-    [
-     "/webdriver/tests/state/text/get_text.py",
-     {}
-    ]
-   ],
-   "webdriver/tests/switch_to_parent_frame.py": [
-    [
-     "/webdriver/tests/switch_to_parent_frame.py",
+   "webdriver/tests/find_element/find.py": [
+    [
+     "/webdriver/tests/find_element/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/find_element_from_element/find.py": [
+    [
+     "/webdriver/tests/find_element_from_element/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements/find.py": [
+    [
+     "/webdriver/tests/find_elements/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements_from_element/find.py": [
+    [
+     "/webdriver/tests/find_elements_from_element/find.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/fullscreen_window/fullscreen.py": [
+    [
+     "/webdriver/tests/fullscreen_window/fullscreen.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_active_element/get.py": [
+    [
+     "/webdriver/tests/get_active_element/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_active_element/user_prompts.py": [
+    [
+     "/webdriver/tests/get_active_element/user_prompts.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_current_url/get.py": [
+    [
+     "/webdriver/tests/get_current_url/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_attribute/get.py": [
+    [
+     "/webdriver/tests/get_element_attribute/get.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_element_attribute/user_prompts.py": [
+    [
+     "/webdriver/tests/get_element_attribute/user_prompts.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_property/get.py": [
+    [
+     "/webdriver/tests/get_element_property/get.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_element_tag_name/get.py": [
+    [
+     "/webdriver/tests/get_element_tag_name/get.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/get_element_text/get.py": [
+    [
+     "/webdriver/tests/get_element_text/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_named_cookie/get.py": [
+    [
+     "/webdriver/tests/get_named_cookie/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_timeouts/get.py": [
+    [
+     "/webdriver/tests/get_timeouts/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_title/get.py": [
+    [
+     "/webdriver/tests/get_title/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/get_window_rect/get.py": [
+    [
+     "/webdriver/tests/get_window_rect/get.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/is_element_selected/selected.py": [
+    [
+     "/webdriver/tests/is_element_selected/selected.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/maximize_window/maximize.py": [
+    [
+     "/webdriver/tests/maximize_window/maximize.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/minimize_window/minimize.py": [
+    [
+     "/webdriver/tests/minimize_window/minimize.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/create_alwaysMatch.py": [
+    [
+     "/webdriver/tests/new_session/create_alwaysMatch.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/create_firstMatch.py": [
+    [
+     "/webdriver/tests/new_session/create_firstMatch.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/default_values.py": [
+    [
+     "/webdriver/tests/new_session/default_values.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/invalid_capabilities.py": [
+    [
+     "/webdriver/tests/new_session/invalid_capabilities.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/merge.py": [
+    [
+     "/webdriver/tests/new_session/merge.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/new_session/response.py": [
+    [
+     "/webdriver/tests/new_session/response.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/page_source/source.py": [
+    [
+     "/webdriver/tests/page_source/source.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/set_window_rect/set.py": [
+    [
+     "/webdriver/tests/set_window_rect/set.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/status/status.py": [
+    [
+     "/webdriver/tests/status/status.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/switch_to_parent_frame/switch.py": [
+    [
+     "/webdriver/tests/switch_to_parent_frame/switch.py",
      {}
     ]
    ],
    "webdriver/tests/user_prompts/accept_alert.py": [
     [
      "/webdriver/tests/user_prompts/accept_alert.py",
      {}
     ]
@@ -502420,21 +502417,21 @@
    "1cde22de011c102163c14a44ac686e97e075b934",
    "testharness"
   ],
   "css/css-fonts/variations/font-opentype-collections.html": [
    "6ef4e5f8931764e1609a7e2c0ccde63092d7c4fc",
    "testharness"
   ],
   "css/css-fonts/variations/font-parse-numeric-stretch-style-weight.html": [
-   "1e116cfb42e4e52fd714ec07c5bce6b9d5dceeda",
+   "ea344025ce1b4da7d1a98e4900de1a290411ba3c",
    "testharness"
   ],
   "css/css-fonts/variations/font-shorthand.html": [
-   "7e193d5e25424699652e64b419e1d1384370e3a4",
+   "15ad8424f678761d0e48b1924fb0baa7a718cbca",
    "testharness"
   ],
   "css/css-fonts/variations/font-stretch.html": [
    "b6d7409267cba17569ddd1caa654f3ab515e85eb",
    "testharness"
   ],
   "css/css-fonts/variations/font-style-interpolation.html": [
    "97f4993c16ac98cf7322b033b75f795d2e1839e0",
@@ -554880,29 +554877,29 @@
    "49bc4349b4e7a85d88cacd54227355aa986535f1",
    "testharness"
   ],
   "fetch/api/request/request-init-002.html": [
    "e6647394acca551e354b27c16013ef713c8ba64e",
    "testharness"
   ],
   "fetch/api/request/request-init-003.sub.html": [
-   "f3084c91090e9c86c5586e947e63baf4990b582e",
+   "98e47b378d13b9b94601eb7c6035c457d53151ca",
    "testharness"
   ],
   "fetch/api/request/request-keepalive-quota.html": [
    "0b9786a3878a361ba8ec3291216d475bd5148541",
    "testharness"
   ],
   "fetch/api/request/request-keepalive.html": [
    "e6c2afd6cef41d358016d4d021b7c3e0e1185704",
    "testharness"
   ],
   "fetch/api/request/request-structure.html": [
-   "cc2471d809fcf7842c38762614c656bb45bb0fc7",
+   "b01d5ae0d56c22d2b86e0efd2cf64ac938770b11",
    "testharness"
   ],
   "fetch/api/request/request-type-attribute-historical.html": [
    "68620f3ea16b7ae1a9f1efde1cd0bb47f1150b9f",
    "testharness"
   ],
   "fetch/api/request/resources/cache.py": [
    "3cd7d5191fe33b2f2dab571a4b006d8332fdf42e",
@@ -557312,17 +557309,17 @@
    "fb63063e0ff1ca6aaa350fae9b8f01bed5f9771f",
    "testharness"
   ],
   "html/browsers/browsing-the-web/scroll-to-fragid/navigate-helpers.js": [
    "5b318196cb31c35e1b39eccd9e6a131a882f1a90",
    "support"
   ],
   "html/browsers/browsing-the-web/scroll-to-fragid/replacement-enabled.html": [
-   "99a355c63562aded2e2b252d989de332e8c12a0d",
+   "c74f0c4c6b2a11d51b87ef7a14bc68c4b0fe0ecd",
    "testharness"
   ],
   "html/browsers/browsing-the-web/scroll-to-fragid/scroll-frag-percent-encoded.html": [
    "ac172eb5c05ee24b8e3059cbc68851729f1be943",
    "testharness"
   ],
   "html/browsers/browsing-the-web/scroll-to-fragid/scroll-to-anchor-name.html": [
    "9bc91bc9bb368e8bf42810ed8aed936a6c9d581a",
@@ -557580,17 +557577,17 @@
    "96bef5eb28559046686f81a7885471e9f4b053a0",
    "support"
   ],
   "html/browsers/browsing-the-web/unloading-documents/unload/007-2.html": [
    "9d9603c8581e26a68022e5781252fb7a19550b49",
    "support"
   ],
   "html/browsers/browsing-the-web/unloading-documents/unload/007.html": [
-   "bfb39279cb1e49176f4c77e0253dd92642f53f34",
+   "ac12d25b792d284b377e889565351f626df7627e",
    "testharness"
   ],
   "html/browsers/browsing-the-web/unloading-documents/unload/008-1.html": [
    "4cb08d9f14425399b36352bb813c88c0403c951c",
    "support"
   ],
   "html/browsers/browsing-the-web/unloading-documents/unload/008.html": [
    "cadd67773d3bf25399a0207ae6d1fa6684dd1781",
@@ -603568,17 +603565,17 @@
    "9745045131b5b37094470dad2b59fa85c0fd1f0f",
    "testharness"
   ],
   "upgrade-insecure-requests/image-upgrade.https.html": [
    "22f2a05853efc4977d7c427f80898cd8671f3aaa",
    "testharness"
   ],
   "upgrade-insecure-requests/link-upgrade.sub.https.html": [
-   "314f8cbd0a8dd96da33d450a3b4b6b2317cad68f",
+   "d8279d5c8b46259643bd960374398ea4d8a455f8",
    "testharness"
   ],
   "upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html": [
    "05d450051981b22ac2b9e903b60435ca695b3ad2",
    "support"
   ],
   "upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html.headers": [
    "658f2c2be22add1a5be72b1e19ba340d024a4832",
@@ -605132,21 +605129,21 @@
    "f3e48d8ddd42f1eecb36af2a8e1cfade6d0a02d4",
    "testharness"
   ],
   "web-animations/animation-model/animation-types/interpolation-per-property.html": [
    "2bcb2919b3034042d8a61d7af5de099a42386451",
    "testharness"
   ],
   "web-animations/animation-model/animation-types/property-list.js": [
-   "d43568b85e47f0284d1084134e043cb04e67d948",
+   "5493ea79d860016c252fb67d6c7d7f17258deb1d",
    "support"
   ],
   "web-animations/animation-model/animation-types/property-types.js": [
-   "d5ccae3dd857f15eab45de2e70b332aaa126a575",
+   "9f6d5f18913c02044cc06c300b924f387025c258",
    "support"
   ],
   "web-animations/animation-model/animation-types/visibility.html": [
    "da3370704ca9e83a1171a64320a240e3145fab2c",
    "testharness"
   ],
   "web-animations/animation-model/combining-effects/applying-the-composited-result.html": [
    "5262331e6a2f957dd70e9a9888825250de65fd5b",
@@ -606307,46 +606304,38 @@
   "webdriver/tests/actions/support/refine.py": [
    "0d244bffe67ef57be68aad99f1cbc7440ff80e27",
    "support"
   ],
   "webdriver/tests/actions/support/test_actions_wdspec.html": [
    "95203777fcc012ab64465287737a89a4ba2c31dc",
    "support"
   ],
+  "webdriver/tests/add_cookie/add.py": [
+   "c87dc51111c10bbc29339ba0d1be85fb35ee6d6f",
+   "wdspec"
+  ],
   "webdriver/tests/conftest.py": [
    "c812269d034c9ca1b8c4f136dd5d0cea52f4d0f0",
    "support"
   ],
   "webdriver/tests/contexts/json_serialize_windowproxy.py": [
    "d29c82c48b3bd1e2b07c40798a774eb77d6178a5",
    "wdspec"
   ],
-  "webdriver/tests/contexts/maximize_window.py": [
-   "e0dfeb6234371077baa7f67a45d7ffa9b61c9759",
-   "wdspec"
-  ],
   "webdriver/tests/contexts/resizing_and_positioning.py": [
    "479379109115668183643e8a050396219332887d",
    "wdspec"
   ],
-  "webdriver/tests/cookies/add_cookie.py": [
-   "c87dc51111c10bbc29339ba0d1be85fb35ee6d6f",
-   "wdspec"
-  ],
-  "webdriver/tests/cookies/delete_cookie.py": [
+  "webdriver/tests/delete_cookie/delete.py": [
    "dbb50588ba525f3ec27a7408eaa4c240614696d5",
    "wdspec"
   ],
-  "webdriver/tests/cookies/get_named_cookie.py": [
-   "e6e265f417d17b4c9d349fbe9aa9fe3923dcfea0",
-   "wdspec"
-  ],
-  "webdriver/tests/document_handling/page_source.py": [
-   "5dddfce0a5e43f02b8a050afda8c9a07c43cf797",
+  "webdriver/tests/element_clear/clear.py": [
+   "476fad0b4a5a38a9ac15ddeb1c26b0b18fd66e8c",
    "wdspec"
   ],
   "webdriver/tests/element_click/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/element_click/bubbling.py": [
    "dde7ca3d7b8ee65222af0044f07087d3b0725bb9",
@@ -606355,44 +606344,24 @@
   "webdriver/tests/element_click/select.py": [
    "bddc341a0feb0d06e75415b8f98b8e9e0c2a829d",
    "wdspec"
   ],
   "webdriver/tests/element_click/stale.py": [
    "37af63203540dfe11d36fe05d74694f05c6505f2",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/__init__.py": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
-  "webdriver/tests/element_retrieval/find_element.py": [
-   "8c9ed3ac2169f4b65a2e172a6e77b9586d83afa2",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/find_element_from_element.py": [
-   "4ac7c4f27f19fe0b6a42fe888b478b78d9c4ca7e",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/find_elements.py": [
-   "fa8c2de1ffd12432bf14368b9c72000567ab8d20",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/find_elements_from_element.py": [
-   "0afca7c9c332ac6bc4da4dd9607ae36b42914a14",
-   "wdspec"
-  ],
-  "webdriver/tests/element_retrieval/get_active_element.py": [
-   "7d40a7641dbf04cd78f1dba630afa2e8d80dad13",
-   "wdspec"
-  ],
   "webdriver/tests/element_send_keys/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "webdriver/tests/element_send_keys/content_editable.py": [
+   "9c071e60e1203cf31120f20874b5f38ba41dacc3",
+   "wdspec"
+  ],
   "webdriver/tests/element_send_keys/form_controls.py": [
    "d169ab4ec07abb0ad3b7b2759f8156d0ab69c6db",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/interactability.py": [
    "197bf11c6cae354d9f3cc07f836a857345046e1c",
    "wdspec"
   ],
@@ -606423,122 +606392,146 @@
   "webdriver/tests/execute_script/cyclic.py": [
    "9d8a28b94b8cdac88650b675cb00bf21261444e8",
    "wdspec"
   ],
   "webdriver/tests/execute_script/user_prompts.py": [
    "901487f8270dcce693867ca090393e093d26f22b",
    "wdspec"
   ],
-  "webdriver/tests/fullscreen_window.py": [
+  "webdriver/tests/find_element/find.py": [
+   "8c9ed3ac2169f4b65a2e172a6e77b9586d83afa2",
+   "wdspec"
+  ],
+  "webdriver/tests/find_element_from_element/find.py": [
+   "4ac7c4f27f19fe0b6a42fe888b478b78d9c4ca7e",
+   "wdspec"
+  ],
+  "webdriver/tests/find_elements/find.py": [
+   "fa8c2de1ffd12432bf14368b9c72000567ab8d20",
+   "wdspec"
+  ],
+  "webdriver/tests/find_elements_from_element/find.py": [
+   "0afca7c9c332ac6bc4da4dd9607ae36b42914a14",
+   "wdspec"
+  ],
+  "webdriver/tests/fullscreen_window/fullscreen.py": [
    "c244064c0595d9274ddef98c527d193355ba13fa",
    "wdspec"
   ],
-  "webdriver/tests/get_window_rect.py": [
-   "c9139c16aa950c734c776887d6a762b867790812",
+  "webdriver/tests/get_active_element/get.py": [
+   "7d40a7641dbf04cd78f1dba630afa2e8d80dad13",
+   "wdspec"
+  ],
+  "webdriver/tests/get_active_element/user_prompts.py": [
+   "91043d10d035e89d04198e70b2fa41305b971b61",
+   "wdspec"
+  ],
+  "webdriver/tests/get_current_url/get.py": [
+   "828e40301838c99aa2978733bbce3db3acc185a0",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_attribute/get.py": [
+   "1fcd451313d40a0b0a84ced63596d032ffc97f2a",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_attribute/user_prompts.py": [
+   "800616a4644d4cb50bcc8b39bd63df7925197b0a",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_property/get.py": [
+   "5e5d8e471d69dd8116e37de07abc07af09216f66",
    "wdspec"
   ],
-  "webdriver/tests/interaction/element_clear.py": [
-   "476fad0b4a5a38a9ac15ddeb1c26b0b18fd66e8c",
+  "webdriver/tests/get_element_tag_name/get.py": [
+   "ce749e286bd030083fcac15dd75c49caf032f990",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_text/get.py": [
+   "570274d59020c4d8d0b8ecd604660ee7d710a165",
+   "wdspec"
+  ],
+  "webdriver/tests/get_named_cookie/get.py": [
+   "e6e265f417d17b4c9d349fbe9aa9fe3923dcfea0",
    "wdspec"
   ],
-  "webdriver/tests/interaction/send_keys_content_editable.py": [
-   "9c071e60e1203cf31120f20874b5f38ba41dacc3",
+  "webdriver/tests/get_timeouts/get.py": [
+   "eaee354d16aa8c3a0fc960198fa4c5d9365bdee5",
+   "wdspec"
+  ],
+  "webdriver/tests/get_title/get.py": [
+   "2ee18932a8ae3c4190b37e2b28141a6af49cc507",
+   "wdspec"
+  ],
+  "webdriver/tests/get_window_rect/get.py": [
+   "c9139c16aa950c734c776887d6a762b867790812",
    "wdspec"
   ],
   "webdriver/tests/interface.html": [
    "f7b2c45ff8b1b5790dd390fbe2ab997766f5d9a8",
    "testharness"
   ],
-  "webdriver/tests/minimize_window.py": [
+  "webdriver/tests/is_element_selected/selected.py": [
+   "f52c565da22038a41db7344cbcfa2a6a101cc61d",
+   "wdspec"
+  ],
+  "webdriver/tests/maximize_window/maximize.py": [
+   "e0dfeb6234371077baa7f67a45d7ffa9b61c9759",
+   "wdspec"
+  ],
+  "webdriver/tests/minimize_window/minimize.py": [
    "08d4414ce915f1ebe7825d5d99e204dc331fe155",
    "wdspec"
   ],
-  "webdriver/tests/navigation/current_url.py": [
-   "828e40301838c99aa2978733bbce3db3acc185a0",
-   "wdspec"
-  ],
-  "webdriver/tests/navigation/get_title.py": [
-   "2ee18932a8ae3c4190b37e2b28141a6af49cc507",
-   "wdspec"
-  ],
-  "webdriver/tests/sessions/get_timeouts.py": [
-   "eaee354d16aa8c3a0fc960198fa4c5d9365bdee5",
-   "wdspec"
-  ],
-  "webdriver/tests/sessions/new_session/conftest.py": [
+  "webdriver/tests/new_session/conftest.py": [
    "d2df38e506cb9a3e501f03fe03e2a31af42d6f04",
    "support"
   ],
-  "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
+  "webdriver/tests/new_session/create_alwaysMatch.py": [
    "84f8ad0908e9ec787f9db73ff66cbe193c2c9626",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/create_firstMatch.py": [
+  "webdriver/tests/new_session/create_firstMatch.py": [
    "fbdabf1852c07db0f5df2d47954c1cd5d7285492",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/default_values.py": [
+  "webdriver/tests/new_session/default_values.py": [
    "92c26366f8fd0d37587457b9b5a630df4b19cc60",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/invalid_capabilities.py": [
+  "webdriver/tests/new_session/invalid_capabilities.py": [
    "fcc36e5ca46cb8a9fb9927d5f618c7e9433a0260",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/merge.py": [
+  "webdriver/tests/new_session/merge.py": [
    "000b28631bb6d862b654f1f998852f5f1a6b2e12",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/response.py": [
+  "webdriver/tests/new_session/response.py": [
    "5eabb99858b9c3051efb351096d7ba8dca8dbfce",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/support/__init__.py": [
+  "webdriver/tests/new_session/support/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/sessions/new_session/support/create.py": [
+  "webdriver/tests/new_session/support/create.py": [
    "4bfb99fd4ba44ab5b4e70e9246cbb200c098ae89",
    "support"
   ],
-  "webdriver/tests/sessions/status.py": [
-   "75edf0e629d9cd494c63585408c76217ff953722",
+  "webdriver/tests/page_source/source.py": [
+   "5dddfce0a5e43f02b8a050afda8c9a07c43cf797",
    "wdspec"
   ],
-  "webdriver/tests/set_window_rect.py": [
+  "webdriver/tests/set_window_rect/set.py": [
    "079038aa66cb729cf205aac040a5fe075d01fd8a",
    "wdspec"
   ],
-  "webdriver/tests/state/__init__.py": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
-  "webdriver/tests/state/get_element_attribute.py": [
-   "1fcd451313d40a0b0a84ced63596d032ffc97f2a",
-   "wdspec"
-  ],
-  "webdriver/tests/state/get_element_property.py": [
-   "5e5d8e471d69dd8116e37de07abc07af09216f66",
-   "wdspec"
-  ],
-  "webdriver/tests/state/get_element_tag_name.py": [
-   "ce749e286bd030083fcac15dd75c49caf032f990",
-   "wdspec"
-  ],
-  "webdriver/tests/state/is_element_selected.py": [
-   "f52c565da22038a41db7344cbcfa2a6a101cc61d",
-   "wdspec"
-  ],
-  "webdriver/tests/state/text/__init__.py": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
-  "webdriver/tests/state/text/get_text.py": [
-   "570274d59020c4d8d0b8ecd604660ee7d710a165",
+  "webdriver/tests/status/status.py": [
+   "75edf0e629d9cd494c63585408c76217ff953722",
    "wdspec"
   ],
   "webdriver/tests/support/__init__.py": [
    "5a31a3917a5157516c10951a3b3d5ffb43b992d9",
    "support"
   ],
   "webdriver/tests/support/asserts.py": [
    "1b839404daaca1d059cba98377edb91691ef7e82",
@@ -606559,17 +606552,17 @@
   "webdriver/tests/support/merge_dictionaries.py": [
    "84a6d3c6f8f4afded0f21264bbaeebec38a7f827",
    "support"
   ],
   "webdriver/tests/support/wait.py": [
    "511d4ba0ff21325b7503440b4111fac325139edc",
    "support"
   ],
-  "webdriver/tests/switch_to_parent_frame.py": [
+  "webdriver/tests/switch_to_parent_frame/switch.py": [
    "487a0588e9c017640017b775c06c21f919d16fa9",
    "wdspec"
   ],
   "webdriver/tests/user_prompts/accept_alert.py": [
    "9cd5e82f18455062ec07a5c8a0bef31cfe4ea86f",
    "wdspec"
   ],
   "webdriver/tests/user_prompts/dismiss_alert.py": [
rename from testing/web-platform/meta/webdriver/tests/cookies/add_cookie.py.ini
rename to testing/web-platform/meta/webdriver/tests/add_cookie/add.py.ini
--- a/testing/web-platform/meta/webdriver/tests/cookies/add_cookie.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/add_cookie/add.py.ini
@@ -1,9 +1,9 @@
-[add_cookie.py]
+[add.py]
   [test_add_domain_cookie]
     expected: FAIL
 
   [test_add_cookie_for_ip]
     expected: FAIL
 
   [test_add_non_session_cookie]
     expected: FAIL
rename from testing/web-platform/meta/webdriver/tests/cookies/delete_cookie.py.ini
rename to testing/web-platform/meta/webdriver/tests/delete_cookie/delete.py.ini
--- a/testing/web-platform/meta/webdriver/tests/cookies/delete_cookie.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/delete_cookie/delete.py.ini
@@ -1,9 +1,9 @@
-[delete_cookie.py]
+[delete.py]
   disabled:
     if debug and stylo and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): wpt-sync Bug None
   [test_handle_prompt_accept]
     expected: FAIL
 
   [test_unknown_cookie]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/interaction/element_clear.py.ini
rename to testing/web-platform/meta/webdriver/tests/element_clear/clear.py.ini
--- a/testing/web-platform/meta/webdriver/tests/interaction/element_clear.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/element_clear/clear.py.ini
@@ -1,9 +1,9 @@
-[element_clear.py]
+[clear.py]
   [test_clear_content_editable_resettable_element[element0\]]
     expected: FAIL
 
   [test_clear_content_editable_resettable_element[element1\]]
     expected: FAIL
 
   [test_clear_content_editable_resettable_element[element2\]]
     expected: FAIL
rename from testing/web-platform/meta/webdriver/tests/element_retrieval/find_element_from_element.py.ini
rename to testing/web-platform/meta/webdriver/tests/find_element_from_element/find.py.ini
--- a/testing/web-platform/meta/webdriver/tests/element_retrieval/find_element_from_element.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/find_element_from_element/find.py.ini
@@ -1,4 +1,4 @@
-[find_element_from_element.py]
+[find.py]
   [test_parent_of_document_node_errors]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/element_retrieval/find_elements_from_element.py.ini
rename to testing/web-platform/meta/webdriver/tests/find_elements_from_element/find.py.ini
--- a/testing/web-platform/meta/webdriver/tests/element_retrieval/find_elements_from_element.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/find_elements_from_element/find.py.ini
@@ -1,4 +1,4 @@
-[find_elements_from_element.py]
+[find.py]
   [test_parent_of_document_node_errors]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/fullscreen_window.py.ini
rename to testing/web-platform/meta/webdriver/tests/fullscreen_window/fullscreen.py.ini
--- a/testing/web-platform/meta/webdriver/tests/fullscreen_window.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/fullscreen_window/fullscreen.py.ini
@@ -1,4 +1,4 @@
-[fullscreen_window.py]
+[fullscreen.py]
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/element_retrieval/get_active_element.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_active_element/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/element_retrieval/get_active_element.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_active_element/get.py.ini
@@ -1,9 +1,9 @@
-[get_active_element.py]
+[get.py]
   disabled:
     if webrender: bug 1425588
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/navigation/current_url.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_current_url/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/navigation/current_url.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_current_url/get.py.ini
@@ -1,3 +1,3 @@
-[current_url.py]
+[get.py]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1429391
rename from testing/web-platform/meta/webdriver/tests/state/get_element_attribute.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_element_attribute/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/get_element_attribute.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_element_attribute/get.py.ini
@@ -1,7 +1,7 @@
-[get_element_attribute.py]
+[get.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/state/get_element_property.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_element_property/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/get_element_property.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_element_property/get.py.ini
@@ -1,7 +1,7 @@
-[get_element_property.py]
+[get.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/state/get_element_tag_name.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_element_tag_name/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/get_element_tag_name.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_element_tag_name/get.py.ini
@@ -1,7 +1,7 @@
-[get_element_tag_name.py]
+[get.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/cookies/get_named_cookie.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_named_cookie/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/cookies/get_named_cookie.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_named_cookie/get.py.ini
@@ -1,4 +1,4 @@
-[get_named_cookie.py]
+[get.py]
   [test_duplicated_cookie]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/navigation/get_title.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_title/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/navigation/get_title.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_title/get.py.ini
@@ -1,9 +1,9 @@
-[get_title.py]
+[get.py]
   disabled:
     if webrender: bug 1425588
   [test_title_handle_prompt_dismiss]
     expected: FAIL
 
   [test_title_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/get_window_rect.py.ini
rename to testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini
--- a/testing/web-platform/meta/webdriver/tests/get_window_rect.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini
@@ -1,6 +1,6 @@
-[get_window_rect.py]
+[get.py]
   disabled:
     if not debug and stylo and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): wpt-sync Bug 1446953
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/state/is_element_selected.py.ini
rename to testing/web-platform/meta/webdriver/tests/is_element_selected/selected.py.ini
--- a/testing/web-platform/meta/webdriver/tests/state/is_element_selected.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/is_element_selected/selected.py.ini
@@ -1,7 +1,7 @@
-[is_element_selected.py]
+[selected.py]
   [test_handle_prompt_dismiss]
     expected: FAIL
 
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/contexts/maximize_window.py.ini
rename to testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini
--- a/testing/web-platform/meta/webdriver/tests/contexts/maximize_window.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini
@@ -1,3 +1,3 @@
-[maximize_window.py]
+[maximize.py]
   disabled:
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1399633
rename from testing/web-platform/meta/webdriver/tests/minimize_window.py.ini
rename to testing/web-platform/meta/webdriver/tests/minimize_window/minimize.py.ini
--- a/testing/web-platform/meta/webdriver/tests/minimize_window.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/minimize_window/minimize.py.ini
@@ -1,6 +1,6 @@
-[minimize_window.py]
+[minimize.py]
   disabled:
     if not debug and stylo and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): wpt-sync Bug 1449780
   [test_handle_prompt_accept]
     expected: FAIL
 
rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/create_alwaysMatch.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/create_alwaysMatch.py.ini
rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/create_firstMatch.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/create_firstMatch.py.ini
rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/default_values.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/default_values.py.ini
rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/invalid_capabilities.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/invalid_capabilities.py.ini
rename from testing/web-platform/meta/webdriver/tests/sessions/new_session/response.py.ini
rename to testing/web-platform/meta/webdriver/tests/new_session/response.py.ini
rename from testing/web-platform/meta/webdriver/tests/set_window_rect.py.ini
rename to testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini
--- a/testing/web-platform/meta/webdriver/tests/set_window_rect.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini
@@ -1,8 +1,8 @@
-[set_window_rect.py]
+[set.py]
   [test_handle_prompt_accept]
     expected: FAIL
 
   [test_restore_from_maximized]
     disabled:
       if debug and stylo and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): wpt-sync Bug 1444624
 
rename from testing/web-platform/tests/webdriver/tests/cookies/add_cookie.py
rename to testing/web-platform/tests/webdriver/tests/add_cookie/add.py
rename from testing/web-platform/tests/webdriver/tests/cookies/delete_cookie.py
rename to testing/web-platform/tests/webdriver/tests/delete_cookie/delete.py
rename from testing/web-platform/tests/webdriver/tests/interaction/element_clear.py
rename to testing/web-platform/tests/webdriver/tests/element_clear/clear.py
deleted file mode 100644
rename from testing/web-platform/tests/webdriver/tests/interaction/send_keys_content_editable.py
rename to testing/web-platform/tests/webdriver/tests/element_send_keys/content_editable.py
rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_element.py
rename to testing/web-platform/tests/webdriver/tests/find_element/find.py
rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_element_from_element.py
rename to testing/web-platform/tests/webdriver/tests/find_element_from_element/find.py
rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_elements.py
rename to testing/web-platform/tests/webdriver/tests/find_elements/find.py
rename from testing/web-platform/tests/webdriver/tests/element_retrieval/find_elements_from_element.py
rename to testing/web-platform/tests/webdriver/tests/find_elements_from_element/find.py
rename from testing/web-platform/tests/webdriver/tests/fullscreen_window.py
rename to testing/web-platform/tests/webdriver/tests/fullscreen_window/fullscreen.py
rename from testing/web-platform/tests/webdriver/tests/element_retrieval/get_active_element.py
rename to testing/web-platform/tests/webdriver/tests/get_active_element/get.py
rename from testing/web-platform/tests/webdriver/tests/navigation/current_url.py
rename to testing/web-platform/tests/webdriver/tests/get_current_url/get.py
rename from testing/web-platform/tests/webdriver/tests/state/get_element_attribute.py
rename to testing/web-platform/tests/webdriver/tests/get_element_attribute/get.py
rename from testing/web-platform/tests/webdriver/tests/state/get_element_property.py
rename to testing/web-platform/tests/webdriver/tests/get_element_property/get.py
rename from testing/web-platform/tests/webdriver/tests/state/get_element_tag_name.py
rename to testing/web-platform/tests/webdriver/tests/get_element_tag_name/get.py
rename from testing/web-platform/tests/webdriver/tests/state/text/get_text.py
rename to testing/web-platform/tests/webdriver/tests/get_element_text/get.py
rename from testing/web-platform/tests/webdriver/tests/cookies/get_named_cookie.py
rename to testing/web-platform/tests/webdriver/tests/get_named_cookie/get.py
rename from testing/web-platform/tests/webdriver/tests/sessions/get_timeouts.py
rename to testing/web-platform/tests/webdriver/tests/get_timeouts/get.py
rename from testing/web-platform/tests/webdriver/tests/navigation/get_title.py
rename to testing/web-platform/tests/webdriver/tests/get_title/get.py
rename from testing/web-platform/tests/webdriver/tests/get_window_rect.py
rename to testing/web-platform/tests/webdriver/tests/get_window_rect/get.py
rename from testing/web-platform/tests/webdriver/tests/state/is_element_selected.py
rename to testing/web-platform/tests/webdriver/tests/is_element_selected/selected.py
rename from testing/web-platform/tests/webdriver/tests/contexts/maximize_window.py
rename to testing/web-platform/tests/webdriver/tests/maximize_window/maximize.py
rename from testing/web-platform/tests/webdriver/tests/minimize_window.py
rename to testing/web-platform/tests/webdriver/tests/minimize_window/minimize.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/conftest.py
rename to testing/web-platform/tests/webdriver/tests/new_session/conftest.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
rename to testing/web-platform/tests/webdriver/tests/new_session/create_alwaysMatch.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/create_firstMatch.py
rename to testing/web-platform/tests/webdriver/tests/new_session/create_firstMatch.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/default_values.py
rename to testing/web-platform/tests/webdriver/tests/new_session/default_values.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/invalid_capabilities.py
rename to testing/web-platform/tests/webdriver/tests/new_session/invalid_capabilities.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/merge.py
rename to testing/web-platform/tests/webdriver/tests/new_session/merge.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/response.py
rename to testing/web-platform/tests/webdriver/tests/new_session/response.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/support/__init__.py
rename to testing/web-platform/tests/webdriver/tests/new_session/support/__init__.py
rename from testing/web-platform/tests/webdriver/tests/sessions/new_session/support/create.py
rename to testing/web-platform/tests/webdriver/tests/new_session/support/create.py
rename from testing/web-platform/tests/webdriver/tests/document_handling/page_source.py
rename to testing/web-platform/tests/webdriver/tests/page_source/source.py
rename from testing/web-platform/tests/webdriver/tests/set_window_rect.py
rename to testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
deleted file mode 100644
deleted file mode 100644
rename from testing/web-platform/tests/webdriver/tests/sessions/status.py
rename to testing/web-platform/tests/webdriver/tests/status/status.py
rename from testing/web-platform/tests/webdriver/tests/switch_to_parent_frame.py
rename to testing/web-platform/tests/webdriver/tests/switch_to_parent_frame/switch.py