Skip to content

Made test cases waiting for the report respose #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mangchiandjjoe merged 1 commit into from
Mar 22, 2017
Merged

Made test cases waiting for the report respose #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/nginx/t/check_key_restriction.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ my $NginxPort = ApiManager::pick_port();
my $BackendPort = ApiManager::pick_port();
my $ServiceControlPort = ApiManager::pick_port();

my $t = Test::Nginx->new()->has(qw/http proxy/)->plan(21);
my $t = Test::Nginx->new()->has(qw/http proxy/)->plan(22);

# Save servce configuration that disables the report cache.
# Report request will be sent for each client request
Expand Down Expand Up @@ -95,8 +95,11 @@ http {
}
EOF

my $report_done = 'report_done';

$t->run_daemon( \&bookstore, $t, $BackendPort, 'bookstore.log' );
$t->run_daemon( \&servicecontrol, $t, $ServiceControlPort, 'servicecontrol.log' );
$t->run_daemon( \&servicecontrol, $t, $ServiceControlPort,
'servicecontrol.log', $report_done);
is( $t->waitforsocket("127.0.0.1:${BackendPort}"), 1, 'Bookstore socket ready.' );
is( $t->waitforsocket("127.0.0.1:${ServiceControlPort}"), 1,
'Service control socket ready.' );
Expand All @@ -115,6 +118,8 @@ X-Ios-Bundle-Identifier: 5b40ad6af9a806305a0a56d7cb91b82a27c26909

EOF

is($t->waitforfile("$t->{_testdir}/${report_done}"), 1,
'Report body file ready.');
$t->stop_daemons();

my ( $response_headers, $response_body ) = split /\r\n\r\n/, $response, 2;
Expand Down Expand Up @@ -209,25 +214,33 @@ EOF
}

sub servicecontrol {
my ( $t, $port, $file ) = @_;
my ( $t, $port, $file, $done) = @_;
my $server = HttpServer->new( $port, $t->testdir() . '/' . $file )
or die "Can't create test server socket: $!\n";
local $SIG{PIPE} = 'IGNORE';

$server->on( 'POST',
'/v1/services/endpoints-test.cloudendpointsapis.com:check', <<'EOF');
$server->on_sub('POST',
'/v1/services/endpoints-test.cloudendpointsapis.com:check', sub {
my ($headers, $body, $client) = @_;
print $client <<'EOF';
HTTP/1.1 200 OK
Connection: close

EOF
});

$server->on( 'POST',
'/v1/services/endpoints-test.cloudendpointsapis.com:report', <<'EOF');
$server->on_sub('POST',
'/v1/services/endpoints-test.cloudendpointsapis.com:report', sub {
my ($headers, $body, $client) = @_;
print $client <<'EOF';
HTTP/1.1 200 OK
Connection: close

EOF

$t->write_file($done, ':report done');
});

$server->run();
}

Expand Down