Skip to content

Commit 97248e1

Browse files
author
Takashi Matsuo
authored
Fixing the broken test (GoogleCloudPlatform#530)
* Adding python-ipaddr * Adding a file for exporting secret. Now it contains MAILJET_APIKEY and MAILJET_SECRET. To decrypt the file, you can run: ``` $ gcloud config set project cloud-samples-tests-php $ gcloud kms decrypt \ --location=global \ --keyring=ci \ --key=ci \ --ciphertext-file=testing/export-secrets.sh.enc \ --plaintext-file=testing/export-secrets.sh ``` * Decrypt in the bash script, allowing failure * Unset the e2e test flags when the secret is not available * Configure gcloud when the service account file is there * Updated the deps for bigquery/stackoverflow * dlp test update * Dependency update for bigquery/stackoverflow * dlp dependency update * DLP test fix * Run devserver test and cs fixer on php56 * Updated to guzzlehttp/guzzle 6.3 for test on PHP7.2 * Allow failures for PHP 7.2 for now * Fixed the wrong travis.yml * Trial and error on travis.yml * Avoid doctrine/instantiator 1.1.0 that has a dep for php ^7.1 * Use `compser update` for PHP 5.6 * Correctly skip the tests when no secrets are available * Use guzzlehttp/guzzle 6.3 for PHP7.2 test failure * Allow any number of rows * Use new style TestCase class * Removed phpunit 4 from some directories * Dependency update for PHP 7.0 * Added a polyphil for phpunit 6 and 4 * Temporarily catch all the exceptions * Dependency update and temporarily catch all the exceptions * Dependency update for pubsub/quickstart * Use google/cloud-tools for tests that use EventuallyConsistentTestTrait * Use the new style classname for PHPUnit * Fixing pubsub/api/test * Use PHPUnit4To6Shim from google/cloud-tools * CS fix * Updating the dependency for spanner * speech dependency update, removed the unnecessary check for libraries
1 parent 8055338 commit 97248e1

File tree

146 files changed

+9932
-41814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+9932
-41814
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ credentials.*
88
**/build/
99
.php_cs.cache
1010
.vscode/
11+
export-secrets.sh

.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,17 @@ language: php
2020
sudo: required
2121
dist: trusty
2222

23+
php:
24+
- 7.0
25+
- 7.1
26+
- 7.2
27+
2328
matrix:
2429
include:
2530
- php: 5.6
26-
env: RUN_DEVSERVER_TESTS=true RUN_CS_FIXER=true
27-
- php: 7.0.8
28-
- php: 7.1
31+
env: RUN_DEVSERVER_TESTS=true RUN_CS_FIXER=true COMPOSER_COMMAND='composer -q update'
32+
allow_failures:
33+
- php: 7.2
2934

3035
env:
3136
global:
@@ -34,12 +39,14 @@ env:
3439
- PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
3540
- PHP_CGI_PATH=/home/travis/.phpenv/shims/php-cgi
3641
- TEST_BUILD_DIR=$TRAVIS_BUILD_DIR
42+
- COMPOSER_COMMAND='composer -q install'
3743

3844
before_install:
3945
- git clone https://github.com/GoogleCloudPlatform/php-tools.git ${HOME}/php-tools
4046
- php ${HOME}/php-tools/scripts/dump_credentials.php
4147
- travis_retry ${HOME}/php-tools/scripts/install_test_deps.sh
4248
- mkdir -p build/logs
49+
- sudo apt-get update && sudo apt-get install -y python-ipaddr
4350

4451
before_script:
4552
- travis_retry pecl install grpc

appengine/flexible/analytics/composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
"require": {
33
"silex/silex": "^1.3",
44
"twig/twig": "^1.24",
5-
"guzzlehttp/guzzle": "^6.2",
5+
"guzzlehttp/guzzle": "^6.3",
66
"symfony/css-selector": "^3.1"
77
},
88
"require-dev": {
9-
"google/cloud-tools": "^0.6",
10-
"phpunit/phpunit": "~4"
9+
"google/cloud-tools": "^0.6"
1110
}
1211
}

0 commit comments

Comments
 (0)