github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-08 17:49:24 -05:00
Code Issues 14.5k Packages Projects Releases 122 Wiki Activity

[PR #12662] [MERGED] test: harden scheduler tests #45155

New Issue
Closed
opened 2026-04-25 00:50:47 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-25 00:50:47 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/12662
Author: @dhiltgen
Created: 10/16/2025
Status: ✅ Merged
Merged: 10/17/2025
Merged by: @dhiltgen

Base: main ← Head: flakes

📝 Commits (2)

  • 49ac2da test: harden scheduler tests
  • 1d4c616 test: tune tests for partial loads

📊 Changes

10 files changed (+195 additions, -143 deletions)

View changed files

📝 integration/concurrency_test.go (+5 -4)
📝 integration/context_test.go (+28 -12)
📝 integration/model_arch_test.go (+18 -1)
📝 integration/utils_test.go (+10 -5)
📝 server/routes_debug_test.go (+18 -18)
📝 server/routes_generate_renderer_test.go (+18 -18)
📝 server/routes_generate_test.go (+27 -27)
📝 server/routes_harmony_streaming_test.go (+27 -27)
📝 server/sched.go (+18 -16)
📝 server/sched_test.go (+26 -15)

📄 Description

This removes reschedDelay which was stale code, and adds a new configurable timeout for the waitForVRAMRecovery so tests can now set the timeout to be very short to avoid the scheduler getting stuck and hitting a test timeout.

This also hardens some integration tests to give partial offload scenarios more time.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/12662 **Author:** [@dhiltgen](https://github.com/dhiltgen) **Created:** 10/16/2025 **Status:** ✅ Merged **Merged:** 10/17/2025 **Merged by:** [@dhiltgen](https://github.com/dhiltgen) **Base:** `main` ← **Head:** `flakes` --- ### 📝 Commits (2) - [`49ac2da`](https://github.com/ollama/ollama/commit/49ac2daa3ea8e03d7dabd97da626d84f838f5b11) test: harden scheduler tests - [`1d4c616`](https://github.com/ollama/ollama/commit/1d4c61690256e0570e8ea2b3c305b62ff40fb94f) test: tune tests for partial loads ### 📊 Changes **10 files changed** (+195 additions, -143 deletions) <details> <summary>View changed files</summary> 📝 `integration/concurrency_test.go` (+5 -4) 📝 `integration/context_test.go` (+28 -12) 📝 `integration/model_arch_test.go` (+18 -1) 📝 `integration/utils_test.go` (+10 -5) 📝 `server/routes_debug_test.go` (+18 -18) 📝 `server/routes_generate_renderer_test.go` (+18 -18) 📝 `server/routes_generate_test.go` (+27 -27) 📝 `server/routes_harmony_streaming_test.go` (+27 -27) 📝 `server/sched.go` (+18 -16) 📝 `server/sched_test.go` (+26 -15) </details> ### 📄 Description This removes reschedDelay which was stale code, and adds a new configurable timeout for the waitForVRAMRecovery so tests can now set the timeout to be very short to avoid the scheduler getting stuck and hitting a test timeout. This also hardens some integration tests to give partial offload scenarios more time. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-25 00:50:47 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#45155
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?