Test Scheduler by the state progress of each RID #1920
Conversation
This file contains 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
Mark cases that has alternative at alternative_case. Include the alternative case in the corresponding position in expect[] with list. Consider alternative case during assertEqual
|
That's pretty cryptic. |
It seems that the previous approach ignore the intermediate state completely. |
added 3 commits
June 22, 2022 10:11
This reverts commit 9191d74.
Add parameter due_date to _get_basic_steps() for more application Create expectRID for each experiment by using _get_basic_steps() Put expectRIDs into expect Create last_state_RID for checking
First identify the RID Then check the state of the corresponding RID Last check the state of each RID when one of them passed all state Change _get_basic_steps parameters' order to common order
Deepskyhunter
changed the title
added 2 commits
June 22, 2022 14:25
Previous change in parameters' order may result in different input of existing code. Put due_date at the back to avoid it. Update the code that used this function
artiq/test/test_scheduler.py
Outdated
Comment on lines
169
to
172
| if type(mod["key"]) is int: | ||
| rid = mod["key"] | ||
| else: | ||
| rid = mod["path"][0] |
There was a problem hiding this comment.
What is that doing? There should at least be an explanatory comment in the code.
There was a problem hiding this comment.
It is for finding the RID of the mod
There was a problem hiding this comment.
I had guessed as much, but why is it done that way?
There was a problem hiding this comment.
Wouldn't it be better to look at mod["action"]?
There was a problem hiding this comment.
Because I have separated the expect case into 3 for each RID, then monitor which state does it go through.
This way can know what they are up to without a conflict of slight time delay.
added 4 commits
June 23, 2022 09:58
Use schedule to record changes from mod. Mark down the order of rid which status changes from pending to preparing in pending_to_preparing.
Two RID would change status at the same time when one of them entering done state (prepare_done and run_done). So once any of them enter that state, checking in next notify would be skipped.
Use it in test_pending_priority check_status to see the update of schedulers is expected or not
added 2 commits
July 13, 2022 16:18
Keep time and status change of each experiment for assert
added 5 commits
July 14, 2022 13:26
it return a list of status the rid went through
artiq/test/test_scheduler.py
Outdated
| @@ -82,6 +85,59 @@ def get(self): | |||
| self._next_rid += 1 | |||
| return rid | |||
|
|
|||
| class SchedulerMonitor(): | |||
artiq/test/test_scheduler.py
Outdated
Comment on lines
114
to
115
| self.exp_flow[key].append(time()) | ||
| self.exp_flow[key].append(current_status) |
added 11 commits
July 18, 2022 14:44
Target a particular status of a rid and set the asyncio.Event()
It has been replaced by basic_flow
asyncio.wait to wait either one rid leave pending stage Update wait_until and record in monitor for successful callback from leave stage
status_records: Information are stored but never used. Plus it can be computed from exp_flow afterward get_time functions are never used.
It was introduced as a condition to end scheduler which is no longer necessary
8 tasks
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.
ARTIQ Pull Request
Description of Changes
Add SchedulerMonitor
use it to record status change and compare with expect_status
use process_mod to update the schedulers in SchedulerMonitor
await
wait_until(rid, <"arrive"/"leave">, status)to operate after certain condition is matchedUse the following method for assertion
get_exp_order(status): the order of exp enter that statusget_status_order(rid): the order of status that the experiment go throughRelated Issue #1888
Type of Changes
Steps (Choose relevant, delete irrelevant before submitting)
All Pull Requests
Code Changes
flake8to check code style (follow PEP-8 style).flake8has issues with parsing Migen/gateware code, ignore as necessary.Git Logistics
git rebase --interactive). Merge/squash/fixup commits that just fix or amend previous commits. Remove unintended changes & cleanup. See tutorial.git show). Format:Licensing
See copyright & licensing for more info.
ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited and are licensed under LGPLv3+.