Skip to content

Commit cd44bf2

Browse files
p-mongop
andcommitted
RUBY-2445 add interactive flag to omit per-test timeouts (#2137)
Co-authored-by: Oleg Pudeyev <oleg@bsdpower.com>
1 parent 4cbb852 commit cd44bf2

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

.evergreen/Dockerfile.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@ ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
197197
PROJECT_DIRECTORY=/app \
198198
<%= @env.map { |k, v| %Q`#{k}="#{v.gsub('$', "\\$").gsub('"', "\\\"")}"` }.join(" \\\n ") %>
199199

200+
<% if interactive? %>
201+
ENV INTERACTIVE=1
202+
<% end %>
203+
200204
COPY . .
201205

202206
<% if expose? %>

.evergreen/test-on-docker

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ class Runner
5656
opts.on('-s', '--script=SCRIPT', 'Test script to invoke') do |v|
5757
@options[:script] = v
5858
end
59+
60+
opts.on('-i', '--interactive', 'Interactive mode - disable per-test timeouts') do |v|
61+
@options[:interactive] = v
62+
end
5963
end.parse!
6064

6165
@env = Hash[ARGV.map do |arg|
@@ -185,6 +189,10 @@ class Runner
185189
!!@options[:preload]
186190
end
187191

192+
def interactive?
193+
!!@options[:interactive]
194+
end
195+
188196
def server_download_url
189197
@server_download_url ||= ServerVersionRegistry.new(server_version, distro).download_url
190198
end

spec/lite_spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
end
109109
end
110110

111-
if SpecConfig.instance.ci?
111+
if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
112112
# Allow a max of 30 seconds per test.
113113
# Tests should take under 10 seconds ideally but it seems
114114
# we have some that run for more than 10 seconds in CI.

0 commit comments

Comments
 (0)