mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

No Bug - Fix js whitspace in h2 test and server. r=mcmanus 

--HG--
extra : rebase_source : 6d89e846b108828e630c5e3aed8e6075bf533f77
This commit is contained in:
Nicholas Hurley 2015-01-30 11:29:14 -08:00
Родитель 8dfdceabf8
Коммит 1e8fe60386
2 изменённых файлов: 47 добавлений и 47 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

54
netwerk/test/unit/test_http2.js
Просмотреть файл

@ -110,7 +110,7 @@ Http2MultiplexListener.prototype.onStopRequest = function(request, ctx, status)
do_check_true(this.onDataAvailableFired);
do_check_true(this.isHttp2Connection);
do_check_true(this.buffer == multiplexContent);
// This is what does most of the hard work for us
register_completed_channel(this);
};
@ -468,21 +468,21 @@ var altsvcClientListener = {
onStopRequest: function test_onStopR(request, ctx, status) {
var isHttp2Connection = checkIsHttp2(request);
if (!isHttp2Connection) {
// not over tls yet - retry. It's all async and transparent to client
var chan = ios.newChannel2("http://localhost:" + httpserv.identity.primaryPort + "/altsvc1",
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
// not over tls yet - retry. It's all async and transparent to client
var chan = ios.newChannel2("http://localhost:" + httpserv.identity.primaryPort + "/altsvc1",
null,
null,
null, // aLoadingNode
Services.scriptSecurityManager.getSystemPrincipal(),
null, // aTriggeringPrincipal
Ci.nsILoadInfo.SEC_NORMAL,
Ci.nsIContentPolicy.TYPE_OTHER)
.QueryInterface(Components.interfaces.nsIHttpChannel);
chan.asyncOpen(altsvcClientListener, null);
chan.asyncOpen(altsvcClientListener, null);
} else {
do_check_true(isHttp2Connection);
httpserv.stop(do_test_finished);
run_next_test();
do_check_true(isHttp2Connection);
httpserv.stop(do_test_finished);
run_next_test();
}
}
};
@ -535,7 +535,7 @@ Http2PushApiListener.prototype = {
pushChannel.asyncOpen(this, pushChannel);
if (pushChannel.originalURI.spec == "https://localhost:" + serverPort + "/pushapi1/2") {
pushChannel.cancel(Components.results.NS_ERROR_ABORT);
pushChannel.cancel(Components.results.NS_ERROR_ABORT);
}
},
@ -549,30 +549,30 @@ Http2PushApiListener.prototype = {
var data = read_stream(stream, cnt);
if (ctx.originalURI.spec == "https://localhost:" + serverPort + "/pushapi1") {
do_check_eq(data[0], '0');
--this.checksPending;
do_check_eq(data[0], '0');
--this.checksPending;
} else if (ctx.originalURI.spec == "https://localhost:" + serverPort + "/pushapi1/1") {
do_check_eq(data[0], '1');
--this.checksPending; // twice
do_check_eq(data[0], '1');
--this.checksPending; // twice
} else if (ctx.originalURI.spec == "https://localhost:" + serverPort + "/pushapi1/3") {
do_check_eq(data[0], '3');
--this.checksPending;
do_check_eq(data[0], '3');
--this.checksPending;
} else {
do_check_eq(true, false);
do_check_eq(true, false);
}
},
onStopRequest: function test_onStopR(request, ctx, status) {
if (ctx.originalURI.spec == "https://localhost:" + serverPort + "/pushapi1/2") {
do_check_eq(request.status, Components.results.NS_ERROR_ABORT);
do_check_eq(request.status, Components.results.NS_ERROR_ABORT);
} else {
do_check_eq(request.status, Components.results.NS_OK);
do_check_eq(request.status, Components.results.NS_OK);
}
--this.checksPending; // 5 times - one for each push plus the pull
if (!this.checksPending) {
run_next_test();
do_test_finished();
run_next_test();
do_test_finished();
}
}
};
@ -665,7 +665,7 @@ var tests = [ test_http2_post_big
, test_http2_push2
, test_http2_push3
, test_http2_push4
, test_http2_altsvc
, test_http2_altsvc
, test_http2_doubleheader
, test_http2_xhr
, test_http2_header

40
testing/xpcshell/moz-http2/moz-http2.js
Просмотреть файл

@ -196,8 +196,8 @@ function handleRequest(req, res) {
else if (u.pathname === "/pushapi1") {
push1 = res.push(
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/1', method : 'GET',
headers: {'x-pushed-request': 'true', 'x-foo' : 'bar'}});
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/1', method : 'GET',
headers: {'x-pushed-request': 'true', 'x-foo' : 'bar'}});
push1.writeHead(200, {
'pushed' : 'yes',
'content-length' : 1,
@ -207,37 +207,37 @@ function handleRequest(req, res) {
push1.end('1');
push1a = res.push(
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/1', method : 'GET',
headers: {'x-foo' : 'bar', 'x-pushed-request': 'true'}});
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/1', method : 'GET',
headers: {'x-foo' : 'bar', 'x-pushed-request': 'true'}});
push1a.writeHead(200, {
'pushed' : 'yes',
'content-length' : 1,
'subresource' : '1a',
'X-Connection-Http2': 'yes'
});
});
push1a.end('1');
push2 = res.push(
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/2', method : 'GET',
headers: {'x-pushed-request': 'true'}});
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/2', method : 'GET',
headers: {'x-pushed-request': 'true'}});
push2.writeHead(200, {
'pushed' : 'yes',
'subresource' : '2',
'content-length' : 1,
'X-Connection-Http2': 'yes'
});
'pushed' : 'yes',
'subresource' : '2',
'content-length' : 1,
'X-Connection-Http2': 'yes'
});
push2.end('2');
push3 = res.push(
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/3', method : 'GET',
headers: {'x-pushed-request': 'true'}});
{ hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/3', method : 'GET',
headers: {'x-pushed-request': 'true'}});
push3.writeHead(200, {
'pushed' : 'yes',
'content-length' : 1,
'subresource' : '3',
'X-Connection-Http2': 'yes'
});
push3.end('3');
'pushed' : 'yes',
'content-length' : 1,
'subresource' : '3',
'X-Connection-Http2': 'yes'
});
push3.end('3');
content = '0';
}