Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade wptrunner #13614

Merged
merged 4 commits into from Oct 18, 2016
Merged

Upgrade wptrunner #13614

merged 4 commits into from Oct 18, 2016

Conversation

@jdm
Copy link
Member

jdm commented Oct 6, 2016

This gets us back to a pristine local copy and allows us to start experimenting with webdriver tests.


This change is Reviewable

@highfive
Copy link

highfive commented Oct 6, 2016

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/devenv_commands.py
  • @jgraham: tests/wpt/harness/wptrunner/wpttest.py, tests/wpt/harness/wptrunner/wptmanifest/tests/test_serializer.py, tests/wpt/harness/wptrunner/wptmanifest/parser.py, tests/wpt/harness/wptrunner/browsers/servo.py, tests/wpt/harness/wptrunner/webdriver_server.py, tests/wpt/harness/wptrunner/wptcommandline.py, tests/wpt/harness/wptrunner/tests/test_chunker.py, tests/wpt/harness/wptrunner/executors/pytestrunner/fixtures.py, tests/wpt/harness/wptrunner/executors/executorservo.py, tests/wpt/harness/wptrunner/wptrunner.py, tests/wpt/harness/wptrunner/browsers/firefox.py, tests/wpt/harness/wptrunner/browsers/init.py, tests/wpt/harness/wptrunner/tests/test_update.py, tests/wpt/harness/wptrunner/testloader.py, tests/wpt/harness/wptrunner/executors/executorservodriver.py, tests/wpt/harness/wptrunner/executors/executormarionette.py, tests/wpt/harness/wptrunner/executors/executorselenium.py, tests/wpt/harness/wptrunner/executors/testharness_webdriver.js, tests/wpt/harness/wptrunner/executors/pytestrunner/runner.py, tests/wpt/harness/wptrunner/testrunner.py, tests/wpt/harness/wptrunner/tests/test_hosts.py
@jdm
Copy link
Member Author

jdm commented Oct 6, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Oct 6, 2016

Trying commit 5c5fd8f with merge a2d554b...

bors-servo added a commit that referenced this pull request Oct 6, 2016
Upgrade wptrunner

This gets us back to a pristine local copy and allows us to start experimenting with webdriver tests.
@Ms2ger
Copy link
Contributor

Ms2ger commented Oct 6, 2016

@bors-servo try- r+

@bors-servo
Copy link
Contributor

bors-servo commented Oct 6, 2016

📌 Commit 5c5fd8f has been approved by Ms2ger

@highfive highfive assigned Ms2ger and unassigned Manishearth Oct 6, 2016
@Ms2ger Ms2ger closed this Oct 6, 2016
@Ms2ger Ms2ger reopened this Oct 6, 2016
@Ms2ger Ms2ger force-pushed the jdm:wptrunnerup3 branch from 5c5fd8f to 64ac008 Oct 6, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented Oct 6, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Oct 6, 2016

📌 Commit 64ac008 has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Oct 6, 2016

Testing commit 64ac008 with merge a578442...

bors-servo added a commit that referenced this pull request Oct 6, 2016
Upgrade wptrunner

This gets us back to a pristine local copy and allows us to start experimenting with webdriver tests.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13614)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 6, 2016

💔 Test failed - mac-rel-wpt2

@jdm
Copy link
Member Author

jdm commented Oct 6, 2016

cc @jgraham for the previous failure:

STDERR: /Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py:161: UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal
  if c == "\\":
STDERR: /Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py:163: UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal
  elif c == "]":
Error running mach:

    ['test-wpt', '--release', '--processes', '8', '--total-chunks', '2', '--this-chunk', '2', '--log-raw', 'test-wpt.log', '--log-errorsummary', 'wpt-errorsummary.log']

The error occurred in code that was called by the mach command. This is either
a bug in the called code itself or in the way that mach is calling it.

You should consider filing a bug for this issue.

If filing a bug, please include the full output of mach, including this error
message.

The details of the failure are as follows:

UnicodeDecodeError: 'ascii' codec can't decode byte 0xce in position 0: ordinal not in range(128)

  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/python/servo/testing_commands.py", line 396, in test_wpt
    return self.run_test_list_or_dispatch(kwargs["test_list"], "wpt", self._test_wpt, **kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/python/servo/testing_commands.py", line 407, in run_test_list_or_dispatch
    return correct_function(**kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/python/servo/testing_commands.py", line 402, in _test_wpt
    return self.wptrunner(run_file, **kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/python/servo/testing_commands.py", line 466, in wptrunner
    return run_globals["run_tests"](**kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/run_wpt.py", line 13, in run_tests
    return run.run_tests(paths=paths, **kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/run.py", line 36, in run_tests
    success = wptrunner.run_tests(**kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptrunner.py", line 135, in run_tests
    **kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptrunner.py", line 71, in get_loader
    include_https=ssl_env.ssl_enabled)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/testloader.py", line 460, in __init__
    self._load_tests()
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/testloader.py", line 526, in _load_tests
    for test_path, test_type, test in self.iter_tests():
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/testloader.py", line 511, in iter_tests
    inherit_metadata, test_metadata = self.load_metadata(manifest_file, metadata_path, test_path)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/testloader.py", line 494, in load_metadata
    metadata_path, test_path, test_manifest.url_base, self.run_info)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/manifestexpected.py", line 236, in get_manifest
    url_base=url_base)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/backends/static.py", line 221, in compile
    return compile_ast(parse(stream),
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 747, in parse
    return p.parse(stream)
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 511, in parse
    self.manifest()
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 527, in manifest
    self.data_block()
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 547, in data_block
    self.data_block()
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 539, in data_block
    self.consume()
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 515, in consume
    self.token = self.token_generator.next()
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 102, in tokenize
    for token in tokens:
  File "/Users/servo/buildbot/slave/mac-rel-wpt2/build/tests/wpt/harness/wptrunner/wptmanifest/parser.py", line 168, in heading_state
    rv += c
program finished with exit code 1

I couldn't reproduce it locally.

@jgraham
Copy link
Contributor

jgraham commented Oct 6, 2016

Try reverting 496353104e7ee0969e316c12caf3dc2988efb8e8 in the wptrunner repo (just a guess).

@jdm
Copy link
Member Author

jdm commented Oct 7, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2016

Trying commit 412ea87 with merge 9de56c4...

bors-servo added a commit that referenced this pull request Oct 7, 2016
Upgrade wptrunner

This gets us back to a pristine local copy and allows us to start experimenting with webdriver tests.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13614)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 7, 2016

@jdm
Copy link
Member Author

jdm commented Oct 7, 2016

@jgraham reverting that commit did the trick.

@jgraham
Copy link
Contributor

jgraham commented Oct 7, 2016

@Ms2ger: apparently things are never simple :(

@Ms2ger
Copy link
Contributor

Ms2ger commented Oct 18, 2016

So it clearly is.

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2016

📌 Commit 412ea87 has been approved by Ms2ger

@Ms2ger
Copy link
Contributor

Ms2ger commented Oct 18, 2016

I'll try to figure out what's wrong after this lands.

@jdm
Copy link
Member Author

jdm commented Oct 18, 2016

@bors-servo: r-
A couple files are missing.

@jdm jdm force-pushed the jdm:wptrunnerup3 branch from 412ea87 to a9c2dda Oct 18, 2016
@jdm
Copy link
Member Author

jdm commented Oct 18, 2016

@bors-servo: r=Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2016

📌 Commit a9c2dda has been approved by Ms2ger

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2016

Testing commit a9c2dda with merge 80447a7...

bors-servo added a commit that referenced this pull request Oct 18, 2016
Upgrade wptrunner

This gets us back to a pristine local copy and allows us to start experimenting with webdriver tests.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13614)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2016

@bors-servo bors-servo merged commit a9c2dda into servo:master Oct 18, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Oct 18, 2016
3 of 3 tasks complete
@Ms2ger Ms2ger deleted the jdm:wptrunnerup3 branch Oct 18, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented Oct 18, 2016

w3c/wptrunner#216 fixes the error seen here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.