Skip to content
Merged
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
1 change: 1 addition & 0 deletions docs/spec/options/hurl/jobs.option
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ value_parser: clap::value_parser!(u32).range(1..)
help: Maximum number of parallel jobs, 1 to disable parallel execution
help_heading: Run options
cli_only: true
config_file: true
env_var: HURL_JOBS
---
Maximum number of parallel jobs in parallel mode. Default value corresponds (in most cases) to the current amount of CPUs. Set to 1 to disable parallel execution of files.
Expand Down
1 change: 1 addition & 0 deletions integration/hurl/tests_ok/parallel/config/hurl/config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--jobs=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Hello A from a parallel world!
Hello B from a parallel world!
Hello C from a parallel world!
Hello D from a parallel world!
Hello E from a parallel world!
Hello F from a parallel world!
Hello G from a parallel world!
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Set-StrictMode -Version latest
$ErrorActionPreference = 'Stop'

$env:XDG_CONFIG_HOME = "$PSScriptRoot/config"

hurl --parallel `
tests_ok/parallel/parallel_a.hurl `
tests_ok/parallel/parallel_b.hurl `
tests_ok/parallel/parallel_c.hurl `
tests_ok/parallel/parallel_d.hurl `
tests_ok/parallel/parallel_e.hurl `
tests_ok/parallel/parallel_f.hurl `
tests_ok/parallel/parallel_g.hurl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
set -Eeuo pipefail

XDG_CONFIG_HOME=$(dirname "$0")/config
export XDG_CONFIG_HOME

hurl --parallel \
tests_ok/parallel/parallel_a.hurl \
tests_ok/parallel/parallel_b.hurl \
tests_ok/parallel/parallel_c.hurl \
tests_ok/parallel/parallel_d.hurl \
tests_ok/parallel/parallel_e.hurl \
tests_ok/parallel/parallel_f.hurl \
tests_ok/parallel/parallel_g.hurl
50 changes: 50 additions & 0 deletions packages/hurl/src/cli/options/config_file/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,22 @@ fn parse_option(reader: &mut Reader, options: &mut CliOptions) -> Result<(), Con
})?;
Ok(())
}
"jobs" => {
parse_value_separator(reader)?;
save = reader.cursor();
let value = parse_value(reader)?;
let jobs = value.parse::<usize>().map_err(|_| {
ConfigFileError::new(save.pos, "Option --jobs requires an integer value")
})?;
if jobs < 1 {
return Err(ConfigFileError::new(
save.pos,
"Option --jobs requires an integer value >= 1",
));
}
options.jobs = Some(jobs);
Ok(())
}
"limit-rate" => {
parse_value_separator(reader)?;
save = reader.cursor();
Expand Down Expand Up @@ -498,6 +514,40 @@ mod tests {
assert_eq!(reader.cursor().pos, Pos::new(2, 1));
}

#[test]
fn test_parse_option_jobs() {
let mut reader = Reader::new("--jobs=4\n");
let mut options = CliOptions::default();
assert!(parse_option(&mut reader, &mut options).is_ok());
assert_eq!(options.jobs, Some(4));
assert_eq!(reader.cursor().pos, Pos::new(2, 1));
}

#[test]
fn test_parse_option_jobs_with_invalid_value() {
let mut reader = Reader::new("--jobs=abc\n");
let mut options = CliOptions::default();
let error = parse_option(&mut reader, &mut options).unwrap_err();
assert_eq!(
error,
ConfigFileError::new(Pos::new(1, 8), "Option --jobs requires an integer value")
);
}

#[test]
fn test_parse_option_jobs_with_too_small_value() {
let mut reader = Reader::new("--jobs=0\n");
let mut options = CliOptions::default();
let error = parse_option(&mut reader, &mut options).unwrap_err();
assert_eq!(
error,
ConfigFileError::new(
Pos::new(1, 8),
"Option --jobs requires an integer value >= 1"
)
);
}

#[test]
fn test_parse_option_limit_rate() {
let mut reader = Reader::new("--limit-rate=2000000\n");
Expand Down
Loading