From 550fca4bcd5ab518a9504c17f8dae06dd8433afc Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 18 Nov 2020 11:25:04 +0100 Subject: [PATCH] Remove coroutine from job update (#2264) --- supervisor/jobs/__init__.py | 2 +- supervisor/store/__init__.py | 12 +++++------- tests/jobs/test_job_manager.py | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/supervisor/jobs/__init__.py b/supervisor/jobs/__init__.py index dfb8fb9fe..fe3fca8eb 100644 --- a/supervisor/jobs/__init__.py +++ b/supervisor/jobs/__init__.py @@ -27,7 +27,7 @@ class SupervisorJob(CoreSysAttributes): """Return the current stage.""" return self._stage - async def update( + def update( self, progress: Optional[int] = None, stage: Optional[str] = None ) -> None: """Update the job object.""" diff --git a/supervisor/store/__init__.py b/supervisor/store/__init__.py index 2d6d14240..b513be5fc 100644 --- a/supervisor/store/__init__.py +++ b/supervisor/store/__init__.py @@ -66,9 +66,7 @@ class StoreManager(CoreSysAttributes): # add new repository async def _add_repository(url: str, step: int): """Add a repository.""" - await job.update( - progress=job.progress + step, stage=f"Checking {url} started" - ) + job.update(progress=job.progress + step, stage=f"Checking {url} started") repository = Repository(self.coresys, url) try: await repository.load() @@ -93,7 +91,7 @@ class StoreManager(CoreSysAttributes): self.repositories[url] = repository - await job.update(progress=10, stage="Check repositories") + job.update(progress=10, stage="Check repositories") repos = new_rep - old_rep tasks = [_add_repository(url, 80 / len(repos)) for url in repos] if tasks: @@ -105,13 +103,13 @@ class StoreManager(CoreSysAttributes): self.sys_config.drop_addon_repository(url) # update data - await job.update(progress=90, stage="Update addons") + job.update(progress=90, stage="Update addons") self.data.update() - await job.update(progress=95, stage="Read addons") + job.update(progress=95, stage="Read addons") self._read_addons() - await job.update(progress=100) + job.update(progress=100) def _read_addons(self) -> None: """Reload add-ons inside store.""" diff --git a/tests/jobs/test_job_manager.py b/tests/jobs/test_job_manager.py index 09c24a124..0a0e3c77c 100644 --- a/tests/jobs/test_job_manager.py +++ b/tests/jobs/test_job_manager.py @@ -26,7 +26,7 @@ async def test_remove_job_with_progress(coresys: CoreSys): job = coresys.jobs.get_job(TEST_JOB) assert job.name in coresys.jobs.jobs - await job.update(progress=100) + job.update(progress=100) assert job.name not in coresys.jobs.jobs @@ -34,6 +34,6 @@ async def test_update_job(coresys: CoreSys): """Test updating jobs.""" job = coresys.jobs.get_job(TEST_JOB) - await job.update(progress=50, stage="stage") + job.update(progress=50, stage="stage") assert job.progress == 50 assert job.stage == "stage"