chore(tools): allow args of run-tests to be passed to riot (#15525)

## Description

previously running the script `./scripts/run-tests` with arguments `--
[any remaining arguments here]` would send all the remaining arguments
to pytest via riot.

So previously we could do
`./scripts/run-tests test_file.py -- -k test_name`

With this change, the arguments are passed first to riot allowing for
example

`./scripts/run-tests test_file.py -- -s -- -k test_name`

here the `-s` option is passed to riot (allowing much faster test start
step, as it won't recompile everything, (but, most of the time, it will
only works if you already run the test without `-s`) and then `-k
test_name` is used as a pytest option.

If you want the previous behavior, you have to add 2 `-- --` to pass
everything to pytest.

`./scripts/run-tests test_file.py -- -- -k test_name`

## Motivation

`-s` option is a big time saver when investigating a problem. Other riot
options may be useful too.

---------

Co-authored-by: T. Kowalski <[email protected]>

Author: christophe-papazian

.claude/skills/run-tests/SKILL.md

@@ -84,7 +84,7 @@ When you modify files like:
 #### For Test-Only Changes
 When you modify `tests/` files (but not test infrastructure):
 - Run only the specific test files/functions modified
-- Use pytest args: `-- -k test_name` or direct test file paths
+- Use pytest args: `-- -- -k test_name` or direct test file paths
 
 #### For Test Infrastructure Changes
 When you modify:
@@ -121,7 +121,7 @@ This will:
 
 For re-running specific tests:
 ```bash
-scripts/run-tests --venv <hash> -- -vv -k test_name
+scripts/run-tests --venv <hash> -- -- -vv -k test_name
 ```
 
 ## When Tests Fail
@@ -243,15 +243,15 @@ scripts/run-tests --list tests/contrib/flask/test_views.py
 # Output shows: contrib::flask suite
 
 # Run just the specific test:
-scripts/run-tests --venv flask_py311 -- -vv tests/contrib/flask/test_views.py
+scripts/run-tests --venv flask_py311 -- -- -vv tests/contrib/flask/test_views.py
 ```
 
 ### Example 4: Iterating on a Failing Test
 
 First run shows one test failing:
 
 ```bash
-scripts/run-tests --venv flask_py311 -- -vv -k test_view_called_twice
+scripts/run-tests --venv flask_py311 -- -- -vv -k test_view_called_twice
 # Focused on the specific failing test with verbose output
 ```
 
@@ -330,7 +330,7 @@ The `scripts/run-tests` system:
 - Uses `riot` to manage multiple Python/package combinations as venvs
 - Each venv is a self-contained environment
 - Docker services are managed per suite lifecycle
-- Tests can pass optional pytest arguments with `--`
+- Tests can pass optional pytest arguments with `-- --`
 
 ### Supported Suite Types
 

docs/contributing-testing.rst

@@ -81,9 +81,14 @@ The ``scripts/run-tests`` script handles this automatically:
 
 .. code-block:: bash
 
+    # Add riot arguments to avoid unnecessary compilation
+    $ scripts/run-tests tests/contrib/django/ -- -s
+
     # Add pytest arguments for test selection
-    $ scripts/run-tests tests/contrib/django/ -- -k test_specific_function
-    $ scripts/run-tests ddtrace/contrib/django/patch.py -- -vvv -s --tb=short
+    $ scripts/run-tests tests/contrib/django/ -- -- -k test_specific_function
+
+    # Add both riot (first) and pytest (second) arguments
+    $ scripts/run-tests ddtrace/contrib/django/patch.py -- -s -- -vvv -s --tb=short
 
     # Run specific test functions
     $ scripts/run-tests tests/contrib/flask/ -- -k "test_request or test_response"

scripts/run-tests

@@ -523,7 +523,7 @@ class TestRunner:
 
                 # Add riot args if provided
                 if riot_args:
-                    cmd.extend(["--"] + riot_args)
+                    cmd.extend(riot_args)
 
                 if dry_run:
                     print(f"[DRY RUN] Would execute: {' '.join(cmd)}")
@@ -655,8 +655,14 @@ Examples:
   # Show what would be run without executing
   scripts/run-tests --dry-run
 
+  # Pass additional arguments to riot
+  scripts/run-tests ddtrace/contrib/django/patch.py -- -s
+
   # Pass additional arguments to pytest
-  scripts/run-tests ddtrace/contrib/django/patch.py -- -vvv -s --tb=short
+  scripts/run-tests ddtrace/contrib/django/patch.py -- -- -vvv -s --tb=short
+
+  # Pass additional arguments to riot (first) and pytest (second)
+  scripts/run-tests ddtrace/contrib/django/patch.py -- -s -- -vvv -k api --tb=short
         """,
     )