yangyi_peng (:Sl0v3C) Assignee
	Description • 7 years ago

User Agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36

Steps to reproduce:

run wdspec test in firefox


Actual results:

No test for webdriver 10.7.4 minimize window feature


Expected results:

There should be a test to check the minimize window feature

	Andreas Tolfsen ❲:ato❳
	Comment 2 • 7 years ago
mozreview-review

Comment on attachment 8898820 [details]
Bug 1391661 - Add Minimize Window test to wdspec;

https://reviewboard.mozilla.org/r/170192/#review175334

Thanks for the patch!  I’ve triggered a try run to see that the test passes.  I’ve also filed https://bugzil.la/1391670 to get you commit access level 1 so that you can trigger try runs in the future.  Please fill out the form and attach your _public_ SSH key to that bug.

	Pulsebot
	Comment 3 • 7 years ago

Pushed by atolfsen@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/1a885b6252b3
Add Minimize Window test to wdspec; r=ato

	Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)
	Comment 4 • 7 years ago

I had to back this out because it was conflicting with my merge from m-c back to autoland, feel free to rebase and reland whenever:
https://hg.mozilla.org/integration/autoland/rev/c8fd5f27080d6f8273d685b37d2262717c564252

	yangyi_peng (:Sl0v3C) Assignee
	Comment 5 • 7 years ago

(In reply to Wes Kocher (:KWierso) from comment #4)
> I had to back this out because it was conflicting with my merge from m-c
> back to autoland, feel free to rebase and reland whenever:
> https://hg.mozilla.org/integration/autoland/rev/
> c8fd5f27080d6f8273d685b37d2262717c564252

Would you please show me how to rebase and reland it.
When I use the gerrit, it can rebase the code in the reveiew site.
Does reviewboard can also rebase?
Or only rebase the local code base then commit --amend & push again?

THX!

	Andreas Tolfsen ❲:ato❳
	Comment 6 • 7 years ago

Autoland normally rebases for you, but conflicts need to be resolved
manually.  For some reason, mozreview doesn’t want to let me
re-open the review.  I am going to check this out manually, rebase,
and push it to inbound myself.

	Pulsebot
	Comment 7 • 7 years ago

Pushed by atolfsen@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/d3f53bf010ea
Add Minimize Window tests to wdspec; r=ato

	Andreas Tolfsen ❲:ato❳
	Comment 8 • 7 years ago

FWIW the conflict was in MANIFEST.json.

	Phil Ringnalda (:philor)
	Comment 9 • 7 years ago
bugherder

https://hg.mozilla.org/mozilla-central/rev/d3f53bf010ea

	yangyi_peng (:Sl0v3C) Assignee
	Comment 10 • 7 years ago

(In reply to Andreas Tolfsen ‹:ato› from comment #8)
> FWIW the conflict was in MANIFEST.json.

THX for your great help.
So if I check this conflict manually, I should run hg rebase solve the conflict & hg commit --amend then hg push to review.
Oh you use git tool, I think I should configure the git tool for m-c.
Thanks again.

	Andreas Tolfsen ❲:ato❳
	Comment 11 • 7 years ago

(In reply to yangyi_peng (:Sl0v3C) from comment #10)

> (In reply to Andreas Tolfsen ‹:ato› from comment #8)
> 
> > FWIW the conflict was in MANIFEST.json.
> 
> So if I check this conflict manually, I should run hg rebase solve
> the conflict & hg commit --amend then hg push to review.

I think that’s right.

When resolving conflicts in MANIFEST.json, I usually do this in git
when rebasing:

> % git checkout --ours testing/web-platform/meta/MANIFEST.json
> % ./mach wpt --manifest-update TESTFILE git add
> % testing/web-platform/meta/MANIFEST.json
> % git rebase --continue

That will dismiss the conflict, but the manifest can be regenerated
with wptrunner.

> Oh you use git tool, I think I should configure the git tool for
> m-c.

I wrote a slightly outdated tutorial on using git for Mozilla work
here:

	https://sny.no/2016/03/geckogit

	yangyi_peng (:Sl0v3C) Assignee
	Comment 12 • 7 years ago

@ato(In reply to Andreas Tolfsen ‹:ato› from comment #11)
> (In reply to yangyi_peng (:Sl0v3C) from comment #10)
> 
> > (In reply to Andreas Tolfsen ‹:ato› from comment #8)
> > 
> > > FWIW the conflict was in MANIFEST.json.
> > 
> > So if I check this conflict manually, I should run hg rebase solve
> > the conflict & hg commit --amend then hg push to review.
> 
> I think that’s right.
> 
> When resolving conflicts in MANIFEST.json, I usually do this in git
> when rebasing:
> 
> > % git checkout --ours testing/web-platform/meta/MANIFEST.json
> > % ./mach wpt --manifest-update TESTFILE git add
> > % testing/web-platform/meta/MANIFEST.json
> > % git rebase --continue
> 
> That will dismiss the conflict, but the manifest can be regenerated
> with wptrunner.
> 
> > Oh you use git tool, I think I should configure the git tool for
> > m-c.
> 
> I wrote a slightly outdated tutorial on using git for Mozilla work
> here:
> 
> 	https://sny.no/2016/03/geckogit
Thanks for your great help!
I will take my spare time to read your tutorial.
THX again.