diff --git a/.gitignore b/.gitignore index 4eaec299b..1e59528e0 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ ChangeLog # doc doc/build/ +.diagram-tools/ .idea env diff --git a/doc/source/user/img/engine_states.svg b/doc/source/user/img/engine_states.svg index 9b874fc47..6fec7279a 100644 --- a/doc/source/user/img/engine_states.svg +++ b/doc/source/user/img/engine_states.svg @@ -1,8 +1,8 @@ - - -Engines statesGAME_OVERREVERTEDrevertedSUCCESSsuccessSUSPENDEDsuspendedFAILUREfailedUNDEFINEDRESUMINGstartSCHEDULINGschedule nextANALYZINGcompletedschedule nextWAITINGwait finishedwait finishedexamine finishedstart + +Engines statesGAME_OVERGAME_OVERREVERTEDREVERTEDGAME_OVER->REVERTEDrevertedSUCCESSSUCCESSGAME_OVER->SUCCESSsuccessSUSPENDEDSUSPENDEDGAME_OVER->SUSPENDEDsuspendedFAILUREFAILUREGAME_OVER->FAILUREfailedUNDEFINEDUNDEFINEDRESUMINGRESUMINGUNDEFINED->RESUMINGstartSCHEDULINGSCHEDULINGRESUMING->SCHEDULINGschedule nextANALYZINGANALYZINGANALYZING->GAME_OVERcompletedANALYZING->SCHEDULINGschedule nextWAITINGWAITINGANALYZING->WAITINGwait finishedSCHEDULING->WAITINGwait finishedWAITING->ANALYZINGexamine finished__start__start__start__->UNDEFINED diff --git a/doc/source/user/img/flow_states.svg b/doc/source/user/img/flow_states.svg index cf60000fa..75d545257 100644 --- a/doc/source/user/img/flow_states.svg +++ b/doc/source/user/img/flow_states.svg @@ -1,8 +1,8 @@ - - -Flow statesPENDINGRUNNINGFAILURESUSPENDINGREVERTEDSUCCESSRESUMINGSUSPENDEDstart + +Flow statesPENDINGPENDINGRUNNINGRUNNINGPENDING->RUNNINGSUSPENDINGSUSPENDINGRUNNING->SUSPENDINGRESUMINGRESUMINGRUNNING->RESUMINGREVERTEDREVERTEDRUNNING->REVERTEDSUCCESSSUCCESSRUNNING->SUCCESSFAILUREFAILURERUNNING->FAILURESUSPENDING->RESUMINGSUSPENDEDSUSPENDEDSUSPENDING->SUSPENDEDSUSPENDING->REVERTEDSUSPENDING->SUCCESSSUSPENDING->FAILURERESUMING->SUSPENDEDSUSPENDED->RUNNINGREVERTED->PENDINGSUCCESS->PENDINGSUCCESS->RUNNINGFAILURE->RUNNING__start__start__start__->PENDING diff --git a/doc/source/user/img/job_states.svg b/doc/source/user/img/job_states.svg index 17fd4e712..e907b403c 100644 --- a/doc/source/user/img/job_states.svg +++ b/doc/source/user/img/job_states.svg @@ -1,8 +1,8 @@ - - -Jobs statesUNCLAIMEDCLAIMEDCOMPLETEstart + +Jobs statesUNCLAIMEDUNCLAIMEDCLAIMEDCLAIMEDUNCLAIMED->CLAIMEDCLAIMED->UNCLAIMEDCOMPLETECOMPLETECLAIMED->COMPLETE__start__start__start__->UNCLAIMED diff --git a/doc/source/user/img/retry_states.svg b/doc/source/user/img/retry_states.svg index abf8498e2..64898a65d 100644 --- a/doc/source/user/img/retry_states.svg +++ b/doc/source/user/img/retry_states.svg @@ -1,8 +1,8 @@ - - -Retries statesPENDINGIGNORERUNNINGSUCCESSFAILURERETRYINGREVERTINGREVERTEDREVERT_FAILUREstart + +Retries statesPENDINGPENDINGIGNOREIGNOREPENDING->IGNORERUNNINGRUNNINGPENDING->RUNNINGIGNORE->PENDINGFAILUREFAILURERUNNING->FAILURESUCCESSSUCCESSRUNNING->SUCCESSREVERTINGREVERTINGFAILURE->REVERTINGSUCCESS->REVERTINGRETRYINGRETRYINGSUCCESS->RETRYINGREVERT_FAILUREREVERT_FAILUREREVERTING->REVERT_FAILUREREVERTEDREVERTEDREVERTING->REVERTEDREVERTED->PENDINGRETRYING->RUNNING__start__start__start__->PENDING diff --git a/doc/source/user/img/task_states.svg b/doc/source/user/img/task_states.svg index a9368e317..5431df0af 100644 --- a/doc/source/user/img/task_states.svg +++ b/doc/source/user/img/task_states.svg @@ -1,8 +1,8 @@ - - -Tasks statesPENDINGIGNORERUNNINGFAILURESUCCESSREVERTINGREVERTEDREVERT_FAILUREstart + +Tasks statesPENDINGPENDINGIGNOREIGNOREPENDING->IGNORERUNNINGRUNNINGPENDING->RUNNINGIGNORE->PENDINGFAILUREFAILURERUNNING->FAILURESUCCESSSUCCESSRUNNING->SUCCESSREVERTINGREVERTINGFAILURE->REVERTINGSUCCESS->REVERTINGREVERT_FAILUREREVERT_FAILUREREVERTING->REVERT_FAILUREREVERTEDREVERTEDREVERTING->REVERTEDREVERTED->PENDING__start__start__start__->PENDING diff --git a/tools/state_graph.py b/tools/state_graph.py index acc80226a..7cd9704ad 100755 --- a/tools/state_graph.py +++ b/tools/state_graph.py @@ -40,6 +40,7 @@ class DummyRuntime(object): self.completer = mock.MagicMock() self.scheduler = mock.MagicMock() self.storage = mock.MagicMock() + self.selector = mock.MagicMock() def make_machine(start_state, transitions, event_name_cb): @@ -129,7 +130,7 @@ def main(): elif options.engines: source_type = "Engines" b = builder.MachineBuilder(DummyRuntime(), mock.MagicMock()) - source, memory = b.build() + source, memory = b.build({}) internal_states.extend(builder.META_STATES) ordering = 'out' elif options.wbe_requests: diff --git a/tools/update_states.sh b/tools/update_states.sh index afaa45daa..10a9b780b 100755 --- a/tools/update_states.sh +++ b/tools/update_states.sh @@ -13,7 +13,7 @@ if [ ! -d "$PWD/.diagram-tools" ]; then fi script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -img_dir="$script_dir/../doc/source/img" +img_dir="$script_dir/../doc/source/user/img" echo "---- Updating task state diagram ----" python $script_dir/state_graph.py -t -f /tmp/states.svg @@ -31,9 +31,10 @@ echo "---- Updating retry state diagram ----" python $script_dir/state_graph.py -r -f /tmp/states.svg $xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/retry_states.svg -echo "---- Updating wbe request state diagram ----" -python $script_dir/state_graph.py -w -f /tmp/states.svg -$xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/wbe_request_states.svg +# NOTE(tkajinam): This is broken since 148963805626f6246554961bd3ff39055de3e317 +# echo "---- Updating wbe request state diagram ----" +# python $script_dir/state_graph.py -w -f /tmp/states.svg +# $xsltproc $PWD/.diagram-tools/notugly.xsl /tmp/states.svg > $img_dir/wbe_request_states.svg echo "---- Updating job state diagram ----" python $script_dir/state_graph.py -j -f /tmp/states.svg diff --git a/tox.ini b/tox.ini index 1e59d92a6..9568a0af6 100644 --- a/tox.ini +++ b/tox.ini @@ -26,8 +26,9 @@ commands = [testenv:update-states] deps = {[testenv]deps} - pydot3 commands = {toxinidir}/tools/update_states.sh +allowlist_externals = + {toxinidir}/tools/update_states.sh [testenv:pep8] commands = pre-commit run -a