Skip to content
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

Log test order #890

Merged
merged 3 commits into from
Sep 10, 2019
Merged

Log test order #890

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed1aa76
Log test order
schneems Jun 6, 2019
a66145b
Merge branch 'master' into schneems/test-order-log
schneems Sep 10, 2019
4df0535
Merge branch 'master' into schneems/test-order-log
schneems Sep 10, 2019
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ group :development, :test do
gem "netrc"
gem "git", github: "hone/ruby-git", branch: "master"
gem 'json', '~> 2.0.2'
gem 'ci-queue'
gem 'ci-queue', github: 'shopify/ci-queue', branch: 'rspec-log-order'
gem 'redis'
end
12 changes: 9 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ GIT
specs:
git (1.2.6)

GIT
remote: https://github.com/shopify/ci-queue.git
revision: 0713fe26a8b0be6290ad109a651b7cf5b242930a
branch: rspec-log-order
specs:
ci-queue (0.16.0)
ansi

GEM
remote: https://rubygems.org/
specs:
Expand All @@ -14,8 +22,6 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
ci-queue (0.16.0)
ansi
citrus (3.0.2)
concurrent-ruby (1.1.5)
diff-lcs (1.3)
Expand Down Expand Up @@ -74,7 +80,7 @@ PLATFORMS
ruby

DEPENDENCIES
ci-queue
ci-queue!
excon
git!
heroku_hatchet
Expand Down
2 changes: 1 addition & 1 deletion app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"scripts": {
"test-setup": "bundle exec rake hatchet:setup_ci",
"test": "bundle exec rspec-queue --max-requeues=3 --timeout 180 --queue $REDIS_URL"
"test": "bundle exec rspec-queue --max-requeues=3 --timeout 180 --queue $REDIS_URL || { cat log/test_order.log; $(exit 1); }"
},
"buildpacks": [
{ "url": "https://github.com/heroku/heroku-buildpack-apt" },
Expand Down