Skip to content

Commit 74dfeec

Browse files
hxiong388hxiong388
committed
Fix Rails GAE integration tests
1 parent 853c00f commit 74dfeec

3 files changed

Lines changed: 2 additions & 8 deletions

File tree

‎integration/deploy.rb‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ def deploy_gae_flex app_dir
3131
last_gae_version = get_gae_versions.last
3232
sh "gcloud app deploy -q" do |ok, res|
3333
if ok
34-
# GAE Flex has a bug that the service is really avaible shortly after
35-
# the deployment commands returns successfully. So we explicitly sleeps
36-
# for 30 seconds before accessing the GAE Flex service.
37-
# TODO: Remove this sleep when GAE Flex deployment becomes smooth
38-
sleep 30
39-
4034
yield
4135

4236
# Delete the last version of Google App Engine if successfully deployed

‎integration/rails4_app/app.yaml.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
runtime: ruby
22
env: flex
3-
entrypoint: cd integration/rails4_app; bundle install; bundle exec rackup -p 8080 config.ru
3+
entrypoint: bash -c "cd integration/rails4_app; bundle install; bundle exec rackup -p 8080 config.ru"
44
health_check:
55
enable_health_check: False

‎integration/rails5_app/app.yaml.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
runtime: ruby
22
env: flex
3-
entrypoint: cd integration/rails5_app; bundle install; bundle exec rackup -p 8080 config.ru
3+
entrypoint: bash -c "cd integration/rails5_app; bundle install; bundle exec rackup -p 8080 config.ru"
44
health_check:
55
enable_health_check: False

0 commit comments

Comments
 (0)