Skip to content
This repository was archived by the owner on Oct 19, 2023. It is now read-only.

Commit efa7675

Browse files
author
Takashi Matsuo
committed
Added an end to end test for grpc extension.
1 parent efeb7c6 commit efa7675

File tree

15 files changed

+11890
-89
lines changed

15 files changed

+11890
-89
lines changed

e2e/EndToEndTest.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,11 @@ public function testSession()
146146
'session.php status code');
147147
$this->assertEquals('1', $body = $resp->getBody()->getContents());
148148
}
149+
150+
public function testGrpcPubsub()
151+
{
152+
$resp = $this->client->get('grpc_pubsub.php');
153+
$this->assertEquals('200', $resp->getStatusCode(),
154+
'grpc_pubsub.php status code');
155+
}
149156
}

php-nginx/build-scripts/build_nginx.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ rm nginx.tar.gz.asc
2929
pushd /usr/src/nginx
3030
./configure \
3131
--prefix=$NGINX_DIR \
32-
--error-log-path=$LOG_DIR/nginx-error.log \
33-
--http-log-path=$LOG_DIR/nginx-access.log \
32+
--error-log-path=$LOG_DIR/app-nginx-error.log \
33+
--http-log-path=$LOG_DIR/app-nginx-access.log \
3434
--user=www-data \
3535
--group=www-data \
3636
--with-http_gzip_static_module \

php-nginx/nginx.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ daemon off;
1616

1717
user www-data;
1818
worker_processes %%NPROC%%;
19-
error_log /var/log/app_engine/nginx-error.log info;
19+
error_log /var/log/app_engine/app-nginx-error.log info;
2020

2121
events {
2222
worker_connections 4096;
@@ -31,7 +31,7 @@ http {
3131

3232
client_max_body_size 32m;
3333

34-
access_log /var/log/app_engine/nginx-access.log;
34+
access_log /var/log/app_engine/app-nginx-access.log;
3535

3636
sendfile on;
3737

scripts/run_test_suite.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ set -ex
2020

2121
# Run php-cs-fixer.
2222
# We want to fail fast for coding standard violations.
23-
php-cs-fixer fix --dry-run --diff --level=psr2 --fixers=concat_with_spaces .
23+
php-cs-fixer fix --dry-run --diff --level=psr2 \
24+
--fixers=concat_with_spaces,unused_use,trailing_spaces,indentation .
25+
2426

2527
# Then build images.
2628
scripts/build_images.sh
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"silex/silex": "^1.3",
4-
"php": "^5.6"
3+
"php": "^5.6",
4+
"silex/silex": "^1.3"
55
}
66
}

testapps/php56_e2e/composer.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
{
2+
"repositories": [
3+
{
4+
"type": "vcs",
5+
"url": "https://github.com/stanley-cheung/Protobuf-PHP"
6+
}
7+
],
28
"require": {
3-
"silex/silex": "^1.3",
4-
"php": "^5.6"
9+
"php": "^5.6",
10+
"datto/protobuf-php": "dev-master",
11+
"google/auth": "dev-master",
12+
"grpc/grpc": "dev-release-0_13",
13+
"silex/silex": "^1.3"
14+
},
15+
"autoload": {
16+
"classmap": ["web"]
517
}
618
}

0 commit comments

Comments
 (0)