Skip to content

Skip e2e/integration tests by default and gracefully skip gated tokenizer test#4757

Merged
rjpower merged 1 commit intomainfrom
claude/issue-4741-20260414-2050
Apr 14, 2026
Merged

Skip e2e/integration tests by default and gracefully skip gated tokenizer test#4757
rjpower merged 1 commit intomainfrom
claude/issue-4741-20260414-2050

Conversation

@rjpower
Copy link
Copy Markdown
Collaborator

@rjpower rjpower commented Apr 14, 2026

Fixes #4741.

Summary

  • Add not integration to pytest default addopts so a plain uv run pytest deselects the integration runner.
  • Mark test_integration_test_run with @pytest.mark.integration.
  • Always skip test_marin_tokenizer.py when the gated llama3 tokenizer cannot be downloaded, not just on CI.

…izer test

- Add `not integration` to pytest default `addopts` so the integration test
  runner that requires an Iris cluster is deselected when running plain
  `uv run pytest`.
- Mark `test_integration_test_run` with `@pytest.mark.integration` so it is
  picked up by the default deselection (in addition to the existing CI skip).
- Always skip the marin tokenizer test when the gated llama3 tokenizer cannot
  be downloaded (instead of only on CI), so contributors without HF access do
  not see a hard failure.

Fixes #4741.

Co-authored-by: Russell Power <rjpower@users.noreply.github.com>
@rjpower rjpower enabled auto-merge (squash) April 14, 2026 21:01
@claude
Copy link
Copy Markdown
Contributor

claude bot commented Apr 14, 2026

Claude finished @rjpower's task in 1m 31s —— View job


Code review

No issues found. Checked for bugs and AGENTS.md compliance.

Notes from review:

  • integration marker is already registered at pyproject.toml:222, so the new addopts filter is well-formed.
  • Integration-running workflows (iris-coreweave-ci.yaml:164, marin-itest.yaml:76) both set -o "addopts=", so they continue to pick up @pytest.mark.integration tests — no regression from the new default.
  • The tokenizer-test change strictly widens the skip (CI + local) and preserves prior CI behavior.
    Branch

@rjpower rjpower requested a review from ravwojdyla April 14, 2026 21:01
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3971d5cc47

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment on lines 26 to +27
except Exception as e:
if os.getenv("CI", False) in ["true", "1"]:
pytest.skip("Llama 3 tokenizer repository is gated")
raise e
pytest.skip(f"Llama 3 tokenizer is unavailable (gated repo or no network): {e}")
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Restrict tokenizer test skip to expected HF access errors

Catching Exception here causes the test to be skipped for any failure in load_llama3_tokenizer(), including real regressions (for example, a bad model ID, local API misuse, or transformer-side breakage) rather than only missing credentials/network. That turns genuine failures into skips and can let tokenizer changes merge without coverage; this should only skip for the specific access-related exceptions documented by load_llama3_tokenizer.

Useful? React with 👍 / 👎.

@rjpower rjpower merged commit 69fc525 into main Apr 14, 2026
44 checks passed
@rjpower rjpower deleted the claude/issue-4741-20260414-2050 branch April 14, 2026 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 tests fail locally

2 participants