test: unblock post-25957 shared CI#26048
Merged
ethernet8023 merged 2 commits intoMay 15, 2026
Merged
Conversation
29 tasks
This was referenced May 15, 2026
ethernet8023
approved these changes
May 15, 2026
Collaborator
There was a problem hiding this comment.
lgtm, ship it. narrow scope, no surprises.
gpt-5 change makes sense, the nous portal tests assert against gpt-5 downstream anyway
also, not a blocker, just noting for whoever picks up future cleanup in this file: tests/run_agent/test_provider_parity.py already has three orphan lines on main immediately below your new elif block:
nice n tight. ty
5 tasks
gweeteve
pushed a commit
to gweeteve/hermes-agent
that referenced
this pull request
Jun 2, 2026
…ord-e2e-history-mock test: unblock post-25957 shared CI
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes the remaining shared CI failures after #25957.
There are two small test-isolation fixes here:
discord.Forbiddenand usesdiscord.MessageType/discord.Object, but the e2e mock still exposed those as genericMagicMockattributes. That made the expected fallback path crash withTypeError: catching classes that do not inherit from BaseException is not allowed.gpt-5for Nous parity tests, matching what those tests assert against later anyway.Related Issue
Follow-up to #25957 and latest
mainTests run25895188143. Does not close a separate issue.Type of Change
Changes Made
tests/e2e/conftest.pydiscord.Forbiddenas an exception class in the e2e Discord mock.discord.MessageType.default/replyvalues for history-context filtering.discord.Object(id=...)mock for cached-historyafter=support.tests/run_agent/test_provider_parity.pygpt-5for Nous provider tests when a model is not provided explicitly.How to Test
25895188143.Validation run locally with
scripts/run_tests.sh:Validation Status
4 failed, 2 passedintests/e2e/test_discord_adapter.py.6 passed in 2.65s.9 passed in 5.03s.149 passed, 7 skipped in 74.56s.git diff --check origin/main...HEADpassed.python -m compileall -q tests/e2e/conftest.py tests/run_agent/test_provider_parity.pypassed.python -m ruff check tests/e2e/conftest.py tests/run_agent/test_provider_parity.pypassed.pytest tests/ -qis not claimed here. This is intentionally a narrow CI unblocker.Checklist
Code
fix(scope):,feat(scope):, etc.)pytest tests/ -qand all tests passscripts/run_tests.shDocumentation & Housekeeping
docs/, docstrings) — N/A, test fixture/helper onlycli-config.yaml.exampleif I added/changed config keys — N/ACONTRIBUTING.mdorAGENTS.mdif I changed architecture or workflows — N/AFor New Skills
N/A
Screenshots / Logs