Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ Options:
--seed SEED Seed for rspec
```

To pass any options supported by paralell_tests, use `--` :

```bash
bundle exec turbo_tests -n 4 -- --only-group 1 --pattern spec/system
```

## Development

After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
Expand Down
8 changes: 6 additions & 2 deletions lib/turbo_tests/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,19 @@ def run
end
end

parallel_options = ParallelTests::CLI.new.send(:parse_options!, @argv.unshift("--type", "rspec"))
files = parallel_options.fetch(:files, ["spec"])

exitstatus = TurboTests::Runner.run(
formatters: formatters,
tags: tags,
files: @argv.empty? ? ["spec"] : @argv,
files: files,
runtime_log: runtime_log,
verbose: verbose,
fail_fast: fail_fast,
count: count,
seed: seed
seed: seed,
parallel_options: parallel_options
)

# From https://github.com/serpapi/turbo_tests/pull/20/
Expand Down
21 changes: 8 additions & 13 deletions lib/turbo_tests/runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def self.run(opts = {})
files = opts[:files]
formatters = opts[:formatters]
tags = opts[:tags]
parallel_options = opts[:parallel_options]

start_time = opts.fetch(:start_time) { RSpec::Core::Time.now }
runtime_log = opts.fetch(:runtime_log, nil)
Expand All @@ -38,14 +39,14 @@ def self.run(opts = {})
count: count,
seed: seed,
seed_used: seed_used,
parallel_options: parallel_options
).run
end

def initialize(opts)
@reporter = opts[:reporter]
@files = opts[:files]
@tags = opts[:tags]
@runtime_log = opts[:runtime_log] || "tmp/turbo_rspec_runtime.log"
@verbose = opts[:verbose]
@fail_fast = opts[:fail_fast]
@count = opts[:count]
Expand All @@ -56,6 +57,10 @@ def initialize(opts)
@load_count = 0
@failure_count = 0

@runtime_log = opts[:runtime_log] || "tmp/turbo_rspec_runtime.log"
@parallel_options = opts.fetch(:parallel_options, {})
@parallel_options[:runtime_log] = @runtime_log

@messages = Thread::Queue.new
@threads = []
@error = false
Expand All @@ -67,25 +72,15 @@ def run
ParallelTests::RSpec::Runner.tests_with_size(@files, {}).size
].min

use_runtime_info = @files == ["spec"]
Comment thread
inkstak marked this conversation as resolved.

group_opts = {}

if use_runtime_info
group_opts[:runtime_log] = @runtime_log
else
group_opts[:group_by] = :filesize
end

tests_in_groups =
ParallelTests::RSpec::Runner.tests_in_groups(
@files,
@num_processes,
**group_opts
@parallel_options
)

subprocess_opts = {
record_runtime: use_runtime_info,
record_runtime: @parallel_options[:group_by] == :runtime
Copy link
Copy Markdown
Author

@inkstak inkstak Apr 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's record runtime log only when --group-by runtime is passed.

Not sure if this line is still relevant...

}

@reporter.report(tests_in_groups) do |reporter|
Expand Down