Commit f00a5618 authored by sammc's avatar sammc Committed by Commit bot

Send less data in the DataSender test that timed out under valgrind.

BUG=405531

Review URL: https://codereview.chromium.org/499243002

Cr-Commit-Position: refs/heads/master@{#291872}
parent bd7c9813
...@@ -97,9 +97,9 @@ TEST_F(DataSenderTest, Send) { ...@@ -97,9 +97,9 @@ TEST_F(DataSenderTest, Send) {
} }
TEST_F(DataSenderTest, LargeSend) { TEST_F(DataSenderTest, LargeSend) {
std::string pattern = "1234567890"; std::string pattern = "123";
std::string expected_data; std::string expected_data;
for (int i = 0; i < 110; i++) for (int i = 0; i < 11; i++)
expected_data += pattern; expected_data += pattern;
expected_data_.push(expected_data); expected_data_.push(expected_data);
RunTest("data_sender_unittest.js", "testLargeSend"); RunTest("data_sender_unittest.js", "testLargeSend");
......
...@@ -57,9 +57,9 @@ unittestBindings.exportTests([ ...@@ -57,9 +57,9 @@ unittestBindings.exportTests([
function testLargeSend() { function testLargeSend() {
createSender().then(test.callbackPass(function(sender) { createSender().then(test.callbackPass(function(sender) {
sender.send(generateData(BUFFER_SIZE * 100, '1234567890')).then( sender.send(generateData(BUFFER_SIZE * 3, '123')).then(
test.callbackPass(function(bytesSent) { test.callbackPass(function(bytesSent) {
test.assertEq(BUFFER_SIZE * 100, bytesSent); test.assertEq(BUFFER_SIZE * 3, bytesSent);
sender.close(); sender.close();
})); }));
})); }));
...@@ -67,7 +67,7 @@ unittestBindings.exportTests([ ...@@ -67,7 +67,7 @@ unittestBindings.exportTests([
function testSendError() { function testSendError() {
createSender().then(test.callbackPass(function(sender) { createSender().then(test.callbackPass(function(sender) {
sender.send(generateData(BUFFER_SIZE * 100, 'b')).catch(test.callbackPass( sender.send(generateData(BUFFER_SIZE * 3, 'b')).catch(test.callbackPass(
function(e) { function(e) {
test.assertEq(1, e.error); test.assertEq(1, e.error);
test.assertEq(0, e.bytesSent); test.assertEq(0, e.bytesSent);
...@@ -82,7 +82,7 @@ unittestBindings.exportTests([ ...@@ -82,7 +82,7 @@ unittestBindings.exportTests([
function testSendErrorPartialSuccess() { function testSendErrorPartialSuccess() {
createSender().then(test.callbackPass(function(sender) { createSender().then(test.callbackPass(function(sender) {
sender.send(generateData(BUFFER_SIZE * 100, 'b')).catch(test.callbackPass( sender.send(generateData(BUFFER_SIZE * 3, 'b')).catch(test.callbackPass(
function(e) { function(e) {
test.assertEq(1, e.error); test.assertEq(1, e.error);
test.assertEq(5, e.bytesSent); test.assertEq(5, e.bytesSent);
...@@ -134,7 +134,7 @@ unittestBindings.exportTests([ ...@@ -134,7 +134,7 @@ unittestBindings.exportTests([
function testSendErrorInLargeSend() { function testSendErrorInLargeSend() {
createSender().then(test.callbackPass(function(sender) { createSender().then(test.callbackPass(function(sender) {
sender.send(generateData(BUFFER_SIZE * 100, '1234567890')).catch( sender.send(generateData(BUFFER_SIZE * 3, '1234567890')).catch(
test.callbackPass(function(e) { test.callbackPass(function(e) {
test.assertEq(1, e.error); test.assertEq(1, e.error);
test.assertEq(12, e.bytesSent); test.assertEq(12, e.bytesSent);
...@@ -153,7 +153,7 @@ unittestBindings.exportTests([ ...@@ -153,7 +153,7 @@ unittestBindings.exportTests([
test.assertEq(1, e.error); test.assertEq(1, e.error);
test.assertEq(2, e.bytesSent); test.assertEq(2, e.bytesSent);
})); }));
sender.send(generateData(BUFFER_SIZE * 100, '1234567890')).catch( sender.send(generateData(BUFFER_SIZE * 3, '1234567890')).catch(
test.callbackPass(function(e) { test.callbackPass(function(e) {
test.assertEq(1, e.error); test.assertEq(1, e.error);
test.assertEq(0, e.bytesSent); test.assertEq(0, e.bytesSent);
......
...@@ -2,6 +2,3 @@ ...@@ -2,6 +2,3 @@
# http://crbug.com/402257 # http://crbug.com/402257
ApiTestBaseTest.* ApiTestBaseTest.*
SerialApiTest.* SerialApiTest.*
# Times out under Valgrind on CrOS, see http://crbug.com/405531
DataSenderTest.*
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment