Oleg Romashin
6f07b68ff9
Auto-merge with m-c b51803f3fdef
2010-06-25 08:30:40 -04:00
Doug Turner
c1b97654d7
Automerge w mozilla-central
2010-06-24 14:06:13 -07:00
Joel Maher
38730305a7
Bug 567417 - bug to get mochitests running on fennec + e10s r=smaug,ctalbert
2010-06-24 13:30:50 -07:00
Clint Talbert
5b5a4adcab
Bug 573263 - Refactor remote reftest to work on android, create shared remoteautomation class r=jmaher
2010-06-24 02:32:01 -07:00
Clint Talbert
c1ea68a998
Bug 573263 - Refactor remote reftest to work on android, create shared remoteautomation class r=jmaher
2010-06-24 02:32:01 -07:00
Jason Duell
8b09ed7151
Merged again from m-c to get latest bits and avoid deleted branch issue.
2010-06-22 17:57:09 -07:00
Jason Duell
549ae22a9e
Merge from m-c.
...
Fair amount of merge conflicts.
Biggest item was changes to nsHttpChannel from web sockets changes.
Other likely suspects if things are borken:
nsFrameLoader.cpp:
- nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or
nsnull (m-c) to local process call to new nsFrameMessageManager(),
callback arg? Smaug said null.
- only calling SetCallBackData for local case. also +r smaug.
nsPrefBranch.cpp had fairly extensive merge conflicts.
nsChromeRegistry had lots of changes.
Dougt did most of the non-necko changes (thanks).
--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
2010-06-22 17:33:57 -07:00
Dave Townsend
454e67e6cc
Bug 573779: Log which tabs were left at the end of a test. r=gavin
2010-06-22 11:28:32 -07:00
Doug Turner
6e5944e4fe
Merging with M-C.
...
Hand merged the following files:
U chrome/src/nsChromeRegistry.cpp
U chrome/src/nsChromeRegistry.h
U content/base/src/nsFrameLoader.cpp
U content/base/src/nsFrameLoader.h
U dom/src/geolocation/nsGeolocation.cpp
U dom/src/geolocation/nsGeolocation.h
U netwerk/build/Makefile.in
U netwerk/cookie/nsCookieService.cpp
U netwerk/cookie/nsCookieService.h
--HG--
rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
2010-06-07 13:38:02 -07:00
Oleg Romashin
91d5a62423
Merge with latest mozilla central r 42802:ffbc3baf03ae
2010-05-25 15:19:33 -04:00
Olli Pettay
3fed591ba3
m-c to e10 merge
2010-05-24 17:45:59 +03:00
Chris Jones
fea6936df1
Merged m-c
2010-05-13 18:04:53 -05:00
Doug Turner
7492065872
merge with m-c. resolved conflicts in:
...
U chrome/src/nsChromeRegistry.cpp
U content/base/src/Makefile.in
U dom/base/nsDOMClassInfo.cpp
U toolkit/toolkit-tiers.mk
--HG--
rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js
2010-05-11 11:09:54 -07:00
Honza Bambas
d1441baf4a
Bug 564975 - Intermittent test_bug455367.html | Test timed out, added larger timeout, r=ted
2010-05-21 22:43:09 +02:00
Josh Matthews
f429b8be27
Bug 550860 - Profile directory for xpcshell based tests needs to be in a predefined, stable, location for at least some tests. r=ted
2010-04-28 03:28:56 +10:00
Ehsan Akhgari
e9dbf69d65
Bug 542928 - Add some more debugging logs to waitForFocus in order to track down the browser-chrome random orange; r=enndeakin
2010-05-19 09:52:07 -04:00
Ehsan Akhgari
82630d3798
Bug 543278 - Try to use a more robust way of making sure that the main browser window is focused before running the next browser-chrome test; r=Mossop
2010-05-12 18:51:04 -04:00
Neil Deakin
114a8a3812
Bug 554873, improve waitForFocus to check for about:blank pages, r=mak
2010-05-18 09:31:03 -04:00
Ben Turner
f3131513d2
Bug 552300 - 'Use VMware VMs to run mochitests, optionally record and repeat until they fail.' r=ted.
2010-05-17 11:00:13 -07:00
Neil Deakin
3384016566
Bug 527099, use waitForFocus to wait for the frameset window
2010-05-17 09:21:11 -04:00
Simon Montagu
e5e59d7066
Tests for bug 563618
2010-05-11 17:38:25 +03:00
Jesse Ruderman
c49b5fefee
Fix MozillaFileLogger bustage ( https://bugzilla.mozilla.org/show_bug.cgi?id=570730#c9 )
...
--HG--
extra : rebase_source : 1720f7e2e57fcebd2362e4f296b38ad463fd6484
2010-06-17 13:36:02 -07:00
Jonathan Griffin
33d2462456
Bug 570789. Add WebSocket support to mochitest. r=ted
...
--HG--
extra : rebase_source : 2e33d054a13824d1a7e527777383820946684c3f
2010-06-16 22:38:55 -07:00
Marco Bonardo
cab3829395
Bug 572425 - nsISearchEngine.getSubmission reponseType should be an [optional] param. r=gavin
2010-06-16 18:54:29 +02:00
Matt Brubeck
02ca497833
Bug 572244 - Mochitests broken in Fennec by bug 571885 [r=gavin]
2010-06-15 23:55:46 -04:00
Oleg Romashin
dc47e440f0
Merged with mozilla-central
2010-04-22 20:22:26 -04:00
Doug Turner
5350023988
Automerge with mc. no manual changes
2010-04-21 03:31:13 -07:00
Mike Hommey
7650e02a73
Bug 555189 - Cleanup reftest and mochitest logs during 'make clean' [r=benjamin]
...
--HG--
extra : rebase_source : 6800bd4391219a089906714554c720b5093a7ea0
2010-04-19 10:28:15 +02:00
Chris Jones
2918f2e692
Merge mozilla-central
2010-04-16 01:34:35 -05:00
Oleg Romashin
f3e3834d75
Merged with mozilla-central
2010-04-07 06:59:04 -04:00
Doug Turner
55aabe42b5
merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.
2010-03-26 14:22:48 -07:00
Clint Talbert
2dcd89fec8
Bug 568624 Running runtestsremote does not work on windows r=jmaher
2010-06-15 13:02:17 -07:00
Benjamin Smedberg
c49b6a2dba
Bug 570488 - Fix loading of XPTs nested in JARs [2/2] r=mwu
...
--HG--
extra : rebase_source : b97a591c0260daed1f2ef2eba69e60ff82acd18f
2010-06-14 16:10:04 -07:00
Dão Gottwald
525a9c47d5
Bug 571885 - blame tests for leaving too many tabs open. pending r=gavin
2010-06-14 17:53:43 +02:00
Michael Kohler
c00ff9684a
Bug 506041 Part 2: Correct misspellings in source code
...
r=timeless
2010-05-13 14:19:50 +02:00
Karl Tomlinson
0b9e884ae0
run plugin crashtests
2010-03-26 16:26:45 +13:00
Ted Mielczarek
ad6f11fba6
bug 563745 - Make automationutils.py's minidump processing able to send minidumps to minidump-stackwalk-cgi. r=catlee
...
--HG--
extra : rebase_source : ebbf745e5e77c55437cb05071f49d421d08956c6
2010-05-06 08:06:09 -04:00
Jeff Walden
b54dc35195
Bug 552560 - Remove support for __parent__. r=mrbkap
2010-04-11 13:51:00 -07:00
Clint Talbert
51f29ced97
Bug 552253 - XPCShell no longer packages devicemanager.py properly r=ted
2010-03-24 10:51:17 -07:00
Joel Maher
5ae85294cb
Bug 553922 - Update remote test code to have MPL header and use devicemanager timeout properly (NPOTB) r=ctalbert
2010-03-24 10:51:17 -07:00
Ehsan Akhgari
e05d675d71
Backed out changeset 0e11e454db6c because of browser-chrome orangeness
2010-05-12 20:49:46 -04:00
Ehsan Akhgari
6e92407dc0
Bug 543278 - Try to use a more robust way of making sure that the main browser window is focused before running the next browser-chrome test; r=Mossop
2010-05-12 18:51:04 -04:00
Jens Hatlak
303597e697
Bug 554418 - "Enable synthesizeDragStart to specify coordinates" [r=enndeakin]
2010-03-24 10:33:00 -04:00
Saint Wesonga
ce8e8515ef
Bug 524201 - Move browserconfig.properties to a jar. r=gavin/pike/kev
2010-05-24 11:38:31 +02:00
Serge Gautherie
e67c09cf35
Bug 427500 - Upgrade the copy of MochiKit used in Mochitest, to v1.4.2; (Gv1a) Explicitly test http://svn.mochikit.com/mochikit/tags/MochiKit-1.4.2/ (== r1480), make it run and pass.
...
r=ctalbert.
2010-04-16 16:50:56 +02:00
Serge Gautherie
2271ce0afe
Bug 427500 - Upgrade the copy of MochiKit used in Mochitest, to v1.4.2; (Fv1a) Explicitly test http://svn.mochikit.com/mochikit/tags/MochiKit-1.4.2/ (== r1480), add bare files.
...
r=ctalbert.
2010-04-16 16:50:56 +02:00
Ben Hearsum
6c0ea9d03d
Bustage fix for Mac tests broken in bug 549427. r=ted CLOSED TREE
2010-04-09 10:27:44 -04:00
John Ford
a0e78d76aa
Bug 549427 - tests tarball should be zip files. r=ted
2010-04-07 17:43:31 -07:00
Ted Mielczarek
51cad48398
Backed out changeset 7886dc6ae0c8 - bug 549427 - tests tarball should be zip files (CLOSED TREE)
2010-04-07 13:32:06 -04:00
John Ford
fadad7b7ff
bug 549427 - tests tarball should be zip files r=ted.mielczarek
2010-03-10 18:01:00 -05:00