Skip to content

test-runner: Simplify and slightly refactor the disk test #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

nicholasbishop
Copy link
Member

@nicholasbishop nicholasbishop commented Jan 14, 2023

Per #553, we've made the test runner always expect to be running in the special QEMU env, so we don't need to have a separate "works with any env" disk test from the more detailed "known disk" test. So, collapse the media/{mod.rs, known_disk.rs} directory to just media.rs.

Also simplify the big disk test function a little by moving the loop to find the test disk into a new function.

Should be no functional change to what is being tested, just a little easier to read now.

Checklist

  • Sensible git history (for example, squash "typo" or "fix" commits). See the Rewriting History guide for help.
  • Update the changelog (if necessary)

Per rust-osdev#553, we've made the test runner
always expect to be running in the special QEMU env, so we don't need to have a
separate "works with any env" disk test from the more detailed "known disk"
test. So, move `known_disk.rs` -> `mod.rs`.
Simplify the big disk test function a little by moving the loop to find the test
disk into a new function.
This is just one file now, so move `media/mod.rs` -> `media.rs`.
@phip1611 phip1611 force-pushed the bishop-disk-test-updates branch from e4b97fa to 8f579a6 Compare January 22, 2023 19:46
@phip1611
Copy link
Member

good cleanup, nice work :)

@nicholasbishop nicholasbishop merged commit 0b7e57d into rust-osdev:main Jan 22, 2023
@nicholasbishop nicholasbishop deleted the bishop-disk-test-updates branch January 22, 2023 20:07
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.

2 participants