Auto merge of #6162 - r0e:testing, r=jdm
Auto merge of #6162 - r0e:testing, r=jdm

Fixes issue #6148 

@jdm After mulling over this for a little while, i'm not sure if this approach is correct. Any comments?

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

zhangjunlei26/servo,GyrosOfWar/servo,steveklabnik/servo,emilio/servo,cbrewster/servo,thiagopnts/servo,dhananjay92/servo,avadacatavra/servo,walac/servo,zentner-kyle/servo,samfoo/servo,deokjinkim/servo,SimonSapin/servo,tschneidereit/servo,canaltinova/servo,SimonSapin/servo,larsbergstrom/servo,zentner-kyle/servo,mdibaiee/servo,fiji-flo/servo,samfoo/servo,mattnenterprise/servo,dagnir/servo,vks/servo,aidanhs/servo,runarberg/servo,steveklabnik/servo,nnethercote/servo,dhananjay92/servo,brendandahl/servo,pyfisch/servo,mattnenterprise/servo,saneyuki/servo,SimonSapin/servo,canaltinova/servo,jlegendary/servo,huonw/servo,vks/servo,szeged/servo,SimonSapin/servo,steveklabnik/servo,steveklabnik/servo,karlito40/servo,jimberlage/servo,peterjoel/servo,rixrix/servo,emilio/servo,nerith/servo,WriterOfAlicrow/servo,meh/servo,larsbergstrom/servo,fiji-flo/servo,eddyb/servo,GyrosOfWar/servo,anthgur/servo,saratang/servo,tafia/servo,nick-thompson/servo,zhangjunlei26/servo,canaltinova/servo,bjwbell/servo,eddyb/servo,dati91/servo,g-k/servo,akosel/servo,bjwbell/servo,ConnorGBrewster/servo,splav/servo,GyrosOfWar/servo,aweinstock314/servo,nick-thompson/servo,rentongzhang/servo,dagnir/servo,larsbergstrom/servo,tafia/servo,ryancanhelpyou/servo,wartman4404/servo,jdramani/servo,walac/servo,nick-thompson/servo,rnestler/servo,dati91/servo,larsbergstrom/servo,GreenRecycleBin/servo,jdramani/servo,saratang/servo,boghison/servo,ryancanhelpyou/servo,walac/servo,karlito40/servo,rixrix/servo,dagnir/servo,WriterOfAlicrow/servo,pyfisch/servo,notriddle/servo,s142857/servo,thiagopnts/servo,upsuper/servo,CJ8664/servo,j3parker/servo,dati91/servo,caldwell/servo,nrc/servo,nnethercote/servo,larsbergstrom/servo,kindersung/servo,runarberg/servo,larsbergstrom/servo,vks/servo,steveklabnik/servo,meh/servo,youprofit/servo,dagnir/servo,aidanhs/servo,aweinstock314/servo,ConnorGBrewster/servo,akosel/servo,deokjinkim/servo,samfoo/servo,KiChjang/servo,GyrosOfWar/servo,nrc/servo,notriddle/servo,paulrouget/servo,mattnenterprise/servo,sadmansk/servo,jlegendary/servo,jgraham/servo,nick-thompson/servo,pyecs/servo,hyowon/servo,paulrouget/servo,jlegendary/servo,codemac/servo,dvberkel/servo,j3parker/servo,notriddle/servo,A-deLuna/servo,cbrewster/servo,mbrubeck/servo,codemac/servo,GreenRecycleBin/servo,akosel/servo,zentner-kyle/servo,fiji-flo/servo,aidanhs/servo,mt2d2/servo,wartman4404/servo,karlito40/servo,eddyb/servo,pyecs/servo,meh/servo,akosel/servo,peterjoel/servo,s142857/servo,mbrubeck/servo,pgonda/servo,splav/servo,dvberkel/servo,saneyuki/servo,huonw/servo,youprofit/servo,codemac/servo,WriterOfAlicrow/servo,canaltinova/servo,caldwell/servo,runarberg/servo,brendandahl/servo,s142857/servo,aidanhs/servo,anthgur/servo,pyfisch/servo,dhananjay92/servo,szeged/servo,szeged/servo,upsuper/servo,pyfisch/servo,KiChjang/servo,ryancanhelpyou/servo,jimberlage/servo,runarberg/servo,peterjoel/servo,splav/servo,bjwbell/servo,avadacatavra/servo,GreenRecycleBin/servo,mattnenterprise/servo,ryancanhelpyou/servo,A-deLuna/servo,eddyb/servo,zhangjunlei26/servo,tempbottle/servo,deokjinkim/servo,walac/servo,vks/servo,meh/servo,emilio/servo,dati91/servo,pyfisch/servo,boghison/servo,boghison/servo,rixrix/servo,boghison/servo,RenaudParis/servo,dhananjay92/servo,aidanhs/servo,saneyuki/servo,anthgur/servo,notriddle/servo,vks/servo,A-deLuna/servo,splav/servo,meh/servo,avadacatavra/servo,steveklabnik/servo,dsandeephegde/servo,rixrix/servo,jlegendary/servo,caldwell/servo,GyrosOfWar/servo,notriddle/servo,cbrewster/servo,saneyuki/servo,DominoTree/servo,ConnorGBrewster/servo,tafia/servo,peterjoel/servo,fiji-flo/servo,CJ8664/servo,canaltinova/servo,boghison/servo,kindersung/servo,sadmansk/servo,wartman4404/servo,nerith/servo,tschneidereit/servo,zhangjunlei26/servo,aweinstock314/servo,canaltinova/servo,nrc/servo,j3parker/servo,AnthonyBroadCrawford/servo,mbrubeck/servo,akosel/servo,dati91/servo,upsuper/servo,ryancanhelpyou/servo,meh/servo,mattnenterprise/servo,runarberg/servo,peterjoel/servo,avadacatavra/servo,pgonda/servo,caldwell/servo,emilio/servo,zhangjunlei26/servo,mdibaiee/servo,nerith/servo,dagnir/servo,brendandahl/servo,s142857/servo,nick-thompson/servo,rixrix/servo,pyfisch/servo,jimberlage/servo,mdibaiee/servo,dsandeephegde/servo,KiChjang/servo,larsbergstrom/servo,jgraham/servo,splav/servo,szeged/servo,nrc/servo,j3parker/servo,szeged/servo,ConnorGBrewster/servo,thiagopnts/servo,mdibaiee/servo,dvberkel/servo,dvberkel/servo,rentongzhang/servo,SimonSapin/servo,CJ8664/servo,paulrouget/servo,DominoTree/servo,g-k/servo,ConnorGBrewster/servo,nnethercote/servo,samfoo/servo,paulrouget/servo,jgraham/servo,peterjoel/servo,zhangjunlei26/servo,dsandeephegde/servo,dvberkel/servo,AnthonyBroadCrawford/servo,mbrubeck/servo,steveklabnik/servo,brendandahl/servo,splav/servo,splav/servo,avadacatavra/servo,rentongzhang/servo,GreenRecycleBin/servo,CJ8664/servo,aweinstock314/servo,bjwbell/servo,samfoo/servo,jimberlage/servo,jimberlage/servo,g-k/servo,tschneidereit/servo,hyowon/servo,emilio/servo,peterjoel/servo,nerith/servo,avadacatavra/servo,mbrubeck/servo,CJ8664/servo,DominoTree/servo,mt2d2/servo,szeged/servo,GreenRecycleBin/servo,mbrubeck/servo,rixrix/servo,notriddle/servo,dsandeephegde/servo,tafia/servo,dsandeephegde/servo,caldwell/servo,jlegendary/servo,paulrouget/servo,dhananjay92/servo,saneyuki/servo,s142857/servo,jgraham/servo,pyfisch/servo,brendandahl/servo,brendandahl/servo,SimonSapin/servo,saratang/servo,DominoTree/servo,zentner-kyle/servo,upsuper/servo,avadacatavra/servo,bjwbell/servo,boghison/servo,huonw/servo,thiagopnts/servo,pyfisch/servo,GreenRecycleBin/servo,kindersung/servo,WriterOfAlicrow/servo,pyecs/servo,sadmansk/servo,jimberlage/servo,cbrewster/servo,pyecs/servo,szeged/servo,anthgur/servo,runarberg/servo,g-k/servo,saratang/servo,aweinstock314/servo,wartman4404/servo,hyowon/servo,cbrewster/servo,tempbottle/servo,karlito40/servo,dvberkel/servo,mt2d2/servo,samfoo/servo,nnethercote/servo,AnthonyBroadCrawford/servo,splav/servo,g-k/servo,karlito40/servo,nrc/servo,anthgur/servo,walac/servo,hyowon/servo,bjwbell/servo,AnthonyBroadCrawford/servo,ConnorGBrewster/servo,upsuper/servo,zentner-kyle/servo,dhananjay92/servo,jlegendary/servo,nerith/servo,saratang/servo,j3parker/servo,rentongzhang/servo,avadacatavra/servo,cbrewster/servo,thiagopnts/servo,nnethercote/servo,mbrubeck/servo,ConnorGBrewster/servo,peterjoel/servo,larsbergstrom/servo,RenaudParis/servo,vks/servo,g-k/servo,tafia/servo,youprofit/servo,KiChjang/servo,dagnir/servo,tschneidereit/servo,vks/servo,mdibaiee/servo,dhananjay92/servo,s142857/servo,jdramani/servo,pgonda/servo,paulrouget/servo,upsuper/servo,pyecs/servo,jgraham/servo,mdibaiee/servo,nrc/servo,dati91/servo,tempbottle/servo,saneyuki/servo,sadmansk/servo,sadmansk/servo,thiagopnts/servo,akosel/servo,mattnenterprise/servo,hyowon/servo,canaltinova/servo,wartman4404/servo,samfoo/servo,kindersung/servo,eddyb/servo,codemac/servo,kindersung/servo,zentner-kyle/servo,eddyb/servo,A-deLuna/servo,szeged/servo,rentongzhang/servo,AnthonyBroadCrawford/servo,anthgur/servo,rixrix/servo,peterjoel/servo,nnethercote/servo,rnestler/servo,anthgur/servo,saneyuki/servo,rixrix/servo,nick-thompson/servo,nnethercote/servo,mt2d2/servo,CJ8664/servo,WriterOfAlicrow/servo,rixrix/servo,meh/servo,kindersung/servo,j3parker/servo,fiji-flo/servo,DominoTree/servo,jdramani/servo,DominoTree/servo,A-deLuna/servo,emilio/servo,wartman4404/servo,zentner-kyle/servo,jdramani/servo,KiChjang/servo,ryancanhelpyou/servo,upsuper/servo,jimberlage/servo,rnestler/servo,nnethercote/servo,larsbergstrom/servo,rnestler/servo,paulrouget/servo,tempbottle/servo,peterjoel/servo,tafia/servo,sadmansk/servo,huonw/servo,codemac/servo,paulrouget/servo,aidanhs/servo,WriterOfAlicrow/servo,tafia/servo,huonw/servo,canaltinova/servo,deokjinkim/servo,mt2d2/servo,s142857/servo,codemac/servo,DominoTree/servo,huonw/servo,SimonSapin/servo,splav/servo,cbrewster/servo,mbrubeck/servo,eddyb/servo,rnestler/servo,jlegendary/servo,pyecs/servo,runarberg/servo,GreenRecycleBin/servo,GreenRecycleBin/servo,youprofit/servo,jgraham/servo,mattnenterprise/servo,RenaudParis/servo,mattnenterprise/servo,boghison/servo,paulrouget/servo,SimonSapin/servo,emilio/servo,aweinstock314/servo,notriddle/servo,youprofit/servo,szeged/servo,nrc/servo,dsandeephegde/servo,emilio/servo,saratang/servo,rnestler/servo,jdramani/servo,fiji-flo/servo,dvberkel/servo,rentongzhang/servo,kindersung/servo,pyfisch/servo,DominoTree/servo,hyowon/servo,GreenRecycleBin/servo,eddyb/servo,ryancanhelpyou/servo,tschneidereit/servo,jimberlage/servo,RenaudParis/servo,ConnorGBrewster/servo,dagnir/servo,hyowon/servo,A-deLuna/servo,caldwell/servo,g-k/servo,emilio/servo,aidanhs/servo,zhangjunlei26/servo,huonw/servo,zhangjunlei26/servo,mdibaiee/servo,nick-thompson/servo,tschneidereit/servo,mt2d2/servo,rnestler/servo,zhangjunlei26/servo,jimberlage/servo,j3parker/servo,upsuper/servo,A-deLuna/servo,rentongzhang/servo,dsandeephegde/servo,emilio/servo,KiChjang/servo,CJ8664/servo,dati91/servo,fiji-flo/servo,pyecs/servo,RenaudParis/servo,pgonda/servo,walac/servo,deokjinkim/servo,tempbottle/servo,saneyuki/servo,caldwell/servo,karlito40/servo,walac/servo,jdramani/servo,tempbottle/servo,RenaudParis/servo,GyrosOfWar/servo,karlito40/servo,saratang/servo,codemac/servo,dsandeephegde/servo,cbrewster/servo,thiagopnts/servo,saneyuki/servo,notriddle/servo,fiji-flo/servo,RenaudParis/servo,bjwbell/servo,pgonda/servo,tschneidereit/servo,GyrosOfWar/servo,thiagopnts/servo,CJ8664/servo,tempbottle/servo,brendandahl/servo,deokjinkim/servo,pyfisch/servo,wartman4404/servo,notriddle/servo,anthgur/servo,saneyuki/servo,mt2d2/servo,sadmansk/servo,KiChjang/servo,pgonda/servo,jgraham/servo,akosel/servo,notriddle/servo,DominoTree/servo,nerith/servo,AnthonyBroadCrawford/servo,deokjinkim/servo,AnthonyBroadCrawford/servo,DominoTree/servo,splav/servo,szeged/servo,youprofit/servo,aweinstock314/servo,sadmansk/servo,nerith/servo,nnethercote/servo,nnethercote/servo,KiChjang/servo,dati91/servo,KiChjang/servo,paulrouget/servo,youprofit/servo,KiChjang/servo,WriterOfAlicrow/servo,pgonda/servo,larsbergstrom/servo,rnestler/servo