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

Add support for viewport size adjustments in wptrunner. #9076

Merged
merged 3 commits into from Jan 4, 2016

Conversation

@Ms2ger
Copy link
Contributor

Ms2ger commented Dec 28, 2015

Review on Reviewable

@Ms2ger
Copy link
Contributor Author

Ms2ger commented Dec 28, 2015

@frewsxcv
Copy link
Member

frewsxcv commented Dec 28, 2015

Only a few left!

@jgraham
Copy link
Contributor

jgraham commented Dec 29, 2015

Reviewed 22 of 22 files at r1.
Review status: all files reviewed at latest revision, 3 unresolved discussions.


tests/wpt/harness/wptrunner/executors/executormarionette.py, line 389 [r1] (raw file):
OK, I guess, but can we file issues to support this for all the executors in the future? I don't see why it would be restricted to servo-only.


tests/wpt/harness/wptrunner/executors/executorservodriver.py, line 230 [r1] (raw file):
This one is particularly problematic, ofc.


tests/wpt/web-platform-tests/tools/manifest/sourcefile.py, line 186 [r1] (raw file):
Don't mention servo in the comment here, please; this will get out of date.


Comments from the review on Reviewable.io

@Ms2ger Ms2ger force-pushed the Ms2ger:viewport branch from d0f22c2 to f561f8b Dec 30, 2015
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Dec 30, 2015

@bors-servo r=jgraham

@bors-servo
Copy link
Contributor

bors-servo commented Dec 30, 2015

📌 Commit f561f8b has been approved by jgraham

@bors-servo
Copy link
Contributor

bors-servo commented Dec 31, 2015

Testing commit f561f8b with merge 02b656b...

bors-servo added a commit that referenced this pull request Dec 31, 2015
Add support for viewport size adjustments in wptrunner.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9076)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 31, 2015

💔 Test failed - mac-rel-wpt

@jdm
Copy link
Member

jdm commented Dec 31, 2015

Error running mach:

    ['test-wpt', '--release', '--processes', '4', '--log-raw', 'test-wpt.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:

TypeError: __init__() got an unexpected keyword argument 'viewport_size'

  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/python/servo/testing_commands.py", line 293, in test_wpt
    return run_globals["run_tests"](**kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/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-wpt/build/tests/wpt/run.py", line 36, in run_tests
    success = wptrunner.run_tests(**kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/wptrunner.py", line 133, in run_tests
    **kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/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-wpt/build/tests/wpt/harness/wptrunner/testloader.py", line 459, in __init__
    self._load_tests()
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/testloader.py", line 525, in _load_tests
    for test_path, test_type, test in self.iter_tests():
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/testloader.py", line 513, in iter_tests
    self.iter_wpttest(inherit_metadata, test_metadata, tests)):
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/testloader.py", line 420, in iterfilter
    for item in iter:
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/testloader.py", line 518, in iter_wpttest
    yield self.get_test(manifest_test, inherit_metadata, test_metadata)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/testloader.py", line 475, in get_test
    return wpttest.from_manifest(manifest_test, inherit_metadata, test_metadata)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/wpttest.py", line 303, in from_manifest
    return test_cls.from_manifest(manifest_test, inherit_metadata, test_metadata)
  File "/Users/servo/buildbot/slave/mac-rel-wpt/build/tests/wpt/harness/wptrunner/wpttest.py", line 117, in from_manifest
    viewport_size=getattr(manifest_item, "viewport_size", None))
@Ms2ger Ms2ger force-pushed the Ms2ger:viewport branch from f561f8b to 8e650f2 Jan 3, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jan 3, 2016

@bors-servo r=jgraham

@bors-servo
Copy link
Contributor

bors-servo commented Jan 3, 2016

📌 Commit 8e650f2 has been approved by jgraham

@bors-servo
Copy link
Contributor

bors-servo commented Jan 3, 2016

Testing commit 8e650f2 with merge 12f67dc...

bors-servo added a commit that referenced this pull request Jan 3, 2016
Add support for viewport size adjustments in wptrunner.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9076)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 3, 2016

💔 Test failed - mac-rel-css

@jdm
Copy link
Member

jdm commented Jan 3, 2016

Error running mach:

    ['test-css', '--release', '--processes', '4', '--log-raw', 'test-css.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:

AttributeError: 'RefTest' object has no attribute 'viewport_size'

  File "/Users/servo/buildbot/slave/mac-rel-css/build/python/servo/testing_commands.py", line 348, in test_css
    return run_globals["run_tests"](**kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/run_css.py", line 13, in run_tests
    return run.run_tests(paths=paths, **kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/run.py", line 36, in run_tests
    success = wptrunner.run_tests(**kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/wptrunner.py", line 133, in run_tests
    **kwargs)
  File "/Users/servo/buildbot/slave/mac-rel-css/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-css/build/tests/wpt/harness/wptrunner/testloader.py", line 459, in __init__
    self._load_tests()
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/testloader.py", line 525, in _load_tests
    for test_path, test_type, test in self.iter_tests():
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/testloader.py", line 513, in iter_tests
    self.iter_wpttest(inherit_metadata, test_metadata, tests)):
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/testloader.py", line 420, in iterfilter
    for item in iter:
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/testloader.py", line 518, in iter_wpttest
    yield self.get_test(manifest_test, inherit_metadata, test_metadata)
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/testloader.py", line 475, in get_test
    return wpttest.from_manifest(manifest_test, inherit_metadata, test_metadata)
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/wpttest.py", line 302, in from_manifest
    return test_cls.from_manifest(manifest_test, inherit_metadata, test_metadata)
  File "/Users/servo/buildbot/slave/mac-rel-css/build/tests/wpt/harness/wptrunner/wpttest.py", line 252, in from_manifest
    viewport_size=manifest_test.viewport_size,
program finished with exit code 1
elapsedTime=7.809151
@Ms2ger Ms2ger force-pushed the Ms2ger:viewport branch from 8e650f2 to 796c77d Jan 4, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jan 4, 2016

@bors-servo r=jgraham

@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2016

📌 Commit 796c77d has been approved by jgraham

@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2016

Testing commit 796c77d with merge 5ad9207...

bors-servo added a commit that referenced this pull request Jan 4, 2016
Add support for viewport size adjustments in wptrunner.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9076)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2016

💔 Test failed - mac-rel-wpt

@KiChjang
Copy link
Member

KiChjang commented Jan 4, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2016

Previous build results for android, gonk, mac-dev-ref-unit, mac-rel-css are reusable. Rebuilding only linux-dev, linux-rel, mac-rel-wpt...

@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jan 4, 2016

Also #9148

@bors-servo
Copy link
Contributor

bors-servo commented Jan 4, 2016

@bors-servo bors-servo merged commit 796c77d into servo:master Jan 4, 2016
2 of 3 checks passed
2 of 3 checks passed
code-review/reviewable Review in progress: 10 of 18 files reviewed, 2 unresolved discussions
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the Ms2ger:viewport branch Jan 4, 2016
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

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