Skip to content

Throttle worker retries in tests#49

Merged
leynos merged 2 commits intomainfrom
codex/update-cooldown-period-and-json-payload
Aug 4, 2025
Merged

Throttle worker retries in tests#49
leynos merged 2 commits intomainfrom
codex/update-cooldown-period-and-json-payload

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Aug 4, 2025

Summary

  • ensure worker retries are throttled during tests
  • return minimal comment payload from mock to satisfy Octocrab

Testing

  • make fmt
  • make lint
  • make test

https://chatgpt.com/codex/tasks/task_e_68910b5a65088322bd9067dfddbec71a

Summary by Sourcery

Throttle worker retries in tests and return a minimal valid mock comment payload.

Enhancements:

  • Throttle worker retries in tests by setting cooldown_period_seconds to a positive value.

Tests:

  • Return a minimal JSON payload from the mock comment endpoint to satisfy Octocrab requirements.

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented Aug 4, 2025

Reviewer's Guide

Tests are updated to enforce retry throttling by setting a positive cooldown period and the mock server now returns a minimal JSON comment payload to satisfy Octocrab.

Class diagram for updated test configuration and mock response

classDiagram
    class Config {
        +u64 cooldown_period_seconds
        ...
    }
    class MockServer
    class Mock
    class ResponseTemplate
    class Octocrab
    class Receiver
    class tempdir
    class temp_config
    class channel

    Config <.. temp_config : uses
    channel <.. Config : uses
    MockServer <.. Mock : mounts
    Mock <.. ResponseTemplate : responds_with
    Octocrab <.. MockServer : interacts

    %% Highlight the change
    Config : +cooldown_period_seconds = 1 (in tests)
    Mock : +respond_with minimal JSON {id, body} for Octocrab
Loading

File-Level Changes

Change Details Files
Throttle worker retries in tests by enabling a cooldown period
  • Set cooldown_period_seconds to 1 instead of 0 in the test configuration
crates/comenqd/src/daemon.rs
Return minimal JSON payload in mock response for Octocrab compatibility
  • Replace empty raw body in mock response with a JSON object containing "id" and "body"
crates/comenqd/src/daemon.rs

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 4, 2025

Summary by CodeRabbit

  • Tests
    • Improved test setup for worker cooldown behaviour and GitHub API mock responses.
  • Chores
    • Added a dedicated "Test Only" step to the continuous integration workflow.

Walkthrough

Update the setup_run_worker test helper in crates/comenqd/src/daemon.rs to set the cooldown_period_seconds configuration from 0 to 1 and modify the mock GitHub API POST response to return a JSON object with explicit "id" and "body" fields. No changes to exported or public entities.

Changes

Cohort / File(s) Change Summary
Test Helper Adjustment
crates/comenqd/src/daemon.rs
Set cooldown_period_seconds to 1 in test config; update mock GitHub POST response to include "id": 1 and "body": "b" fields. No changes to public APIs.
CI Workflow Update
.github/workflows/ci.yml
Added a new "Test Only" step running make test between "Lint" and coverage steps in the CI pipeline.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Possibly related PRs

Poem

A cooldown of one, not zero for fun,
Mocked GitHub replies with fields, not none.
The worker now tests with a body and id,
In a world where precision and clarity lie.
Cheers to the helpers that quietly run! 🚀

✨ Finishing Touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/update-cooldown-period-and-json-payload

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Hey @leynos - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 453d723 and 2fdcdc1.

📒 Files selected for processing (1)
  • crates/comenqd/src/daemon.rs (2 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
**/*.rs

📄 CodeRabbit Inference Engine (AGENTS.md)

**/*.rs: Clippy warnings MUST be disallowed.
Fix any warnings emitted during tests in the code itself rather than silencing them.
Where a function is too long, extract meaningfully named helper functions adhering to separation of concerns and CQRS.
Where a function has too many parameters, group related parameters in meaningfully named structs.
Where a function is returning a large error consider using Arc to reduce the amount of data returned.
Write unit and behavioural tests for new functionality. Run both before and after making any change.
Every module must begin with a module level (//! ) comment explaining the module's purpose and utility.
Document public APIs using Rustdoc comments (///) so documentation can be generated with cargo doc.
Prefer immutable data and avoid unnecessary mut bindings.
Handle errors with the Result type instead of panicking where feasible.
Avoid unsafe code unless absolutely necessary and document any usage clearly.
Place function attributes after doc comments.
Do not use return in single-line functions.
Use predicate functions for conditional criteria with more than two branches.
Lints must not be silenced except as a last resort.
Lint rule suppressions must be tightly scoped and include a clear reason.
Prefer expect over allow.
Use rstest fixtures for shared setup.
Replace duplicated tests with #[rstest(...)] parameterised cases.
Prefer mockall for mocks/stubs.
Prefer .expect() over .unwrap().
Use concat!() to combine long string literals rather than escaping newlines with a backslash.
Prefer semantic error enums. Derive std::error::Error (via the thiserror crate) for any condition the caller might inspect, retry, or map to an HTTP status.
Use an opaque error only at the app boundary. Use eyre::Report for human-readable logs; these should not be exposed in public APIs.
Never export the opaque type from a library. Convert to domain enums at API boundaries, and to eyre only in the main main() entrypoint or top-level async task.

Files:

  • crates/comenqd/src/daemon.rs

⚙️ CodeRabbit Configuration File

**/*.rs: * Seek to keep the cyclomatic complexity of functions no more than 12.

  • Adhere to single responsibility and CQRS

  • Place function attributes after doc comments.

  • Do not use return in single-line functions.

  • Move conditionals with >2 branches into a predicate function.

  • Avoid unsafe unless absolutely necessary.

  • Every module must begin with a //! doc comment that explains the module's purpose and utility.

  • Comments and docs must follow en-GB-oxendict (-ize / -our) spelling and grammar

  • Lints must not be silenced except as a last resort.

    • #[allow] is forbidden.
    • Only narrowly scoped #[expect(lint, reason = "...")] is allowed.
    • No lint groups, no blanket or file-wide suppression.
    • Include FIXME: with link if a fix is expected.
  • Use rstest fixtures for shared setup and to avoid repetition between tests.

  • Replace duplicated tests with #[rstest(...)] parameterised cases.

  • Prefer mockall for mocks/stubs.

  • Prefer .expect() over .unwrap()

  • Ensure that any API or behavioural changes are reflected in the documentation in docs/

  • Ensure that any completed roadmap steps are recorded in the appropriate roadmap in docs/

  • Files must not exceed 400 lines in length

    • Large modules must be decomposed
    • Long match statements or dispatch tables should be decomposed by domain and collocated with targets
    • Large blocks of inline data (e.g., test fixtures, constants or templates) must be moved to external files and inlined at compile-time or loaded at run-time.

Files:

  • crates/comenqd/src/daemon.rs
🔇 Additional comments (1)
crates/comenqd/src/daemon.rs (1)

356-361: Return a complete IssueComment stub to prevent deserialisation failure

octocrab::models::issues::Comment contains required fields (node_id, url, html_url, user, etc.). Responding with only id and body risks a serde “missing field” error, which would surface as an octocrab::Error and force the worker down the error path even with a 2xx status.

Populate the bare minimum mandatory fields or stub with set_body_raw instead:

-ResponseTemplate::new(status).set_body_json(&serde_json::json!({
-    "id": 1,
-    "body": "b",
-}))
+ResponseTemplate::new(status).set_body_json(&serde_json::json!({
+    "id": 1,
+    "node_id": "MDQ6VXNlcjE=",
+    "url": "https://api.github.com/",
+    "html_url": "https://github.com/",
+    "body": "b",
+    "user": { "login": "test", "id": 1 },
+    "created_at": "2020-01-01T00:00:00Z",
+    "updated_at": "2020-01-01T00:00:00Z"
+}))

Verify with the test run to ensure the deserialiser now succeeds.

Comment on lines +337 to 339
// Use a positive cooldown to ensure retries are throttled.
cooldown_period_seconds: 1,
..temp_config(&dir)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Use a sub-second cooldown to avoid lengthening the test suite

Setting cooldown_period_seconds to 1 eliminates the busy-spin, but it also injects a full-second sleep into every retry loop. When a test exercises multiple retries this quickly balloons overall runtime. Throttle without slowing the suite by switching to a millisecond-scale delay, e.g.

-cooldown_period_seconds: 1,
+cooldown_period_seconds: 0, // keep struct value
+// …
+tokio::time::sleep(Duration::from_millis(5)).await; // apply during test only

or keep the field but assign 0 here and patch run_worker in tests to inject the delay.

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents
In crates/comenqd/src/daemon.rs around lines 337 to 339, the
cooldown_period_seconds is set to 1, causing a full-second delay on each retry
which slows down the test suite. Change this to a sub-second value, such as
using milliseconds instead of seconds, or set cooldown_period_seconds to 0 here
and modify the run_worker function in tests to apply the desired delay. This
will throttle retries without significantly increasing test runtime.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2fdcdc1 and 2792c5f.

📒 Files selected for processing (1)
  • .github/workflows/ci.yml (1 hunks)

Comment thread .github/workflows/ci.yml
Comment on lines +25 to +26
- name: Test Only
run: make test
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Eliminate or justify the duplicated test run

make test is now executed in this “Test Only” step and (implicitly) again inside the “Test and Measure Coverage” step. Running the full suite twice:

• adds several minutes to CI wall-clock time,
• recompiles the crate graph twice (different rustc flags → cache miss),
• burns extra GitHub Actions minutes.

If the intention is a fail-fast guard, either (a) drop test execution from the coverage action or (b) gate this step behind a condition (e.g. only on PRs) to avoid the double run on main. Provide a comment explaining the rationale so future maintainers do not treat it as accidental.

🤖 Prompt for AI Agents
In .github/workflows/ci.yml around lines 25 to 26, the "Test Only" step runs
`make test` which duplicates test execution already done in the "Test and
Measure Coverage" step, causing unnecessary CI time and resource usage. To fix
this, either remove the `make test` command from the "Test Only" step or add a
condition to run it only on pull requests or specific branches to avoid double
runs on main. Also, add a comment explaining the chosen approach to clarify the
intent for future maintainers.

@leynos leynos merged commit 598c228 into main Aug 4, 2025
1 of 2 checks passed
@leynos leynos deleted the codex/update-cooldown-period-and-json-payload branch August 4, 2025 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant