Bug 1485948 [wpt PR 12671] - Fixup import of WebDriver helper functions, a=testonly
authorJames Graham <james@hoppipolla.co.uk>
Wed, 29 Aug 2018 22:37:13 +0000
changeset 492022 56782ad0a34eb6ae1200b23c1978d74eb5f1fd44
parent 492021 2a04160615839f4dd90b24ae7d4e613e6cda1bf5
child 492023 f55a2af22e465137aec559d7f4e9ebc00a23914d
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1485948, 12671
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1485948 [wpt PR 12671] - Fixup import of WebDriver helper functions, a=testonly Automatic update from web-platform-testsFixup import of WebDriver helper functions -- wpt-commits: 267a39b7d4dd76e83131405ab6854bd14e65a27c wpt-pr: 12671
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/webdriver/tests/support/inline.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -650347,17 +650347,17 @@
    "b2db3e7b0d338f1325214cd8019b7cac613dd8b1",
    "support"
   ],
   "webdriver/tests/support/http_request.py": [
    "5e46d97017e14ba009d4d1ed6d62bb5012f48d15",
    "support"
   ],
   "webdriver/tests/support/inline.py": [
-   "8b4f1657cffb193511da346bc4c236aac1d70308",
+   "3bf56c84bedb47e024a88983fa15c232ddba7899",
    "support"
   ],
   "webdriver/tests/support/merge_dictionaries.py": [
    "cf06c9b433cee167c5c98e06d64cc7a2e68faff3",
    "support"
   ],
   "webdriver/tests/support/wait.py": [
    "6f439ec61a372bc1202f226a3b4e3f41509d5f60",
--- a/testing/web-platform/tests/webdriver/tests/support/inline.py
+++ b/testing/web-platform/tests/webdriver/tests/support/inline.py
@@ -1,13 +1,13 @@
 import urllib
 
 
 def inline(doc, doctype="html", mime="text/html;charset=utf-8", protocol="http"):
-    from .fixtures import server_config, url
+    from ..conftest import server_config, url
     build_url = url(server_config())
 
     if doctype == "html":
         mime = "text/html;charset=utf-8"
     elif doctype == "xhtml":
         mime = "application/xhtml+xml"
         doc = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">