Skip to content

/ servo

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 #12223

Closed
wants to merge 8 commits into from
Closed

Upgrade wptrunner #12223

wants to merge 8 commits into from
+320 −863

Conversation

@jdm
Copy link
Member

jdm commented Jul 4, 2016 •
edited by larsbergstrom

This should allow us to start running and writing new webdriver tests.

Note, this currently undoes the viewport-related change from #11953. @Manishearth what do you want to do here?

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because our test instrastructure will test it

This change is Reviewable
@jdm
Rename mach command to upgrade wptrunner and make it work more than o…
c1fbb77 
…nce.
@highfive
Copy link

highfive commented Jul 4, 2016

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/devenv_commands.py
  • @jgraham: tests/wpt/harness/wptrunner/browsers/webdriver.py, tests/wpt/harness/wptrunner/executors/webdriver.py, tests/wpt/harness/wptrunner/tests/test_chunker.py, tests/wpt/harness/tox.ini, tests/wpt/harness/wptrunner/wptmanifest/tests/test_serializer.py, tests/wpt/harness/wptrunner/executors/pytestrunner/fixtures.py, tests/wpt/harness/wptrunner/executors/executorservo.py, tests/wpt/harness/wptrunner/wpttest.py, tests/wpt/harness/wptrunner/browsers/servo.py, tests/wpt/harness/.travis.yml, tests/wpt/harness/wptrunner/browsers/firefox.py, tests/wpt/harness/wptrunner/webdriver_server.py, tests/wpt/harness/wptrunner/tests/test_update.py, tests/wpt/harness/wptrunner/executors/executormarionette.py, tests/wpt/harness/wptrunner/wptcommandline.py, tests/wpt/harness/wptrunner/tests/test_hosts.py
@jdm
Copy link
Member Author

jdm commented Jul 4, 2016

Let's be sure not to merge this until we address the reverted change from #11953.
@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 4, 2016

Please reinstate the resolution change; I'll upstream it.
@jdm
Upgrade wptrunner to 18c1cf0.
Loading status checks…
d5025a9
@jdm jdm force-pushed the jdm:wptrunnerup branch from a4a8d82 to d5025a9 Jul 4, 2016
@jdm jdm removed the S-needs-decision label Jul 4, 2016
@jdm
Copy link
Member Author

jdm commented Jul 4, 2016

Done.
@Ms2ger
Copy link
Contributor

Ms2ger commented Jul 4, 2016

r=me unless you want someone else to look at it first
@jdm
Copy link
Member Author

jdm commented Jul 4, 2016

@bors-servo: r=Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

📌 Commit d5025a9 has been approved by Ms2ger
@highfive highfive assigned Ms2ger and unassigned cbrewster Jul 4, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

⌛ Testing commit d5025a9 with merge 87aa410...
bors-servo added a commit that referenced this pull request Jul 4, 2016
@bors-servo
Auto merge of #12223 - jdm:wptrunnerup, r=Ms2ger
87aa410 
Upgrade wptrunner

This should allow us to start running and writing new webdriver tests.

Note, this currently undoes the viewport-related change from #11953. @Manishearth what do you want to do here?

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because our test instrastructure will test it

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

bors-servo commented Jul 4, 2016

💔 Test failed - mac-rel-css
@jdm
Require pytest for Servo's wptrunner needs.
Loading status checks…
da088c7
@jdm
Copy link
Member Author

jdm commented Jul 4, 2016

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

⌛ Trying commit da088c7 with merge d5cd0fe...
bors-servo added a commit that referenced this pull request Jul 4, 2016
@bors-servo
Auto merge of #12223 - jdm:wptrunnerup, r=<try>
d5cd0fe 
Upgrade wptrunner

This should allow us to start running and writing new webdriver tests.

Note, this currently undoes the viewport-related change from #11953. @Manishearth what do you want to do here?

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because our test instrastructure will test it

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12223)
<!-- Reviewable:end -->
@jdm
Copy link
Member Author

jdm commented Jul 4, 2016 •
edited

@bors-servo: retry
bors-servo added a commit that referenced this pull request Jul 4, 2016
@bors-servo
Auto merge of #12223 - jdm:wptrunnerup, r=<try>
7a2c188 
Upgrade wptrunner

This should allow us to start running and writing new webdriver tests.

Note, this currently undoes the viewport-related change from #11953. @Manishearth what do you want to do here?

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because our test instrastructure will test it

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

bors-servo commented Jul 4, 2016

⌛ Trying commit da088c7 with merge 7a2c188...
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

💔 Test failed - linux-rel
@jdm
Delay webdriver import.
Loading status checks…
f9d5894
@highfive highfive removed the S-tests-failed label Jul 4, 2016
@jdm
Copy link
Member Author

jdm commented Jul 4, 2016 •
edited

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Jul 4, 2016

⌛ Trying commit f9d5894 with merge 2273f50...
bors-servo added a commit that referenced this pull request Jul 4, 2016
@bors-servo
Auto merge of #12223 - jdm:wptrunnerup, r=<try>
2273f50 
Upgrade wptrunner

This should allow us to start running and writing new webdriver tests.

Note, this currently undoes the viewport-related change from #11953. @Manishearth what do you want to do here?

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because our test instrastructure will test it

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

bors-servo commented Jul 4, 2016

💔 Test failed - mac-rel-wpt
@jdm
wip
4bf4d59
@larsbergstrom larsbergstrom mentioned this pull request Jul 7, 2016
Closed
jdm added 3 commits Jul 7, 2016
@jdm
Avoid #12321 by creating environment before switching directories.
f8e4311
@jdm
Upgrade wptrunner to dd8ba1a0710c476ec4f56f78db87f634762085ee.
c82f9e6
@jdm
Fix pytest import.
Loading status checks…
56ce7da
@highfive highfive removed the S-tests-failed label Jul 7, 2016
@jdm
Copy link
Member Author

jdm commented Jul 7, 2016

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

⌛ Trying commit 56ce7da with merge 46aa28e...
bors-servo added a commit that referenced this pull request Jul 7, 2016
@bors-servo
Auto merge of #12223 - jdm:wptrunnerup, r=<try>
46aa28e 
Upgrade wptrunner

This should allow us to start running and writing new webdriver tests.

Note, this currently undoes the viewport-related change from #11953. @Manishearth what do you want to do here?

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because our test instrastructure will test it

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

bors-servo commented Jul 7, 2016

💔 Test failed - linux-dev
@bors-servo
Copy link
Contributor

bors-servo commented Jul 7, 2016

☔ The latest upstream changes (presumably #12324) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm jdm mentioned this pull request Jul 11, 2016
Closed
@jdm jdm removed the S-awaiting-review label Jul 14, 2016
@jdm
Copy link
Member Author

jdm commented Sep 13, 2016

I have another branch that's more up to date than this one.
@jdm jdm closed this Sep 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
S-needs-rebase S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@jdm @highfive @Ms2ger @bors-servo @cbrewster
You can’t perform that action at this time.