refactor(backend): type enumeration failures
This commit is contained in:
@@ -18,6 +18,7 @@ from bot_bottle.backend.docker.compose import (
|
||||
list_compose_projects,
|
||||
slug_from_compose_project,
|
||||
)
|
||||
from bot_bottle.backend import EnumerationError
|
||||
|
||||
|
||||
class TestProjectNaming(unittest.TestCase):
|
||||
@@ -76,7 +77,7 @@ class TestComposeProjectListing(unittest.TestCase):
|
||||
args=["docker"], returncode=1, stdout="", stderr="no daemon",
|
||||
),
|
||||
):
|
||||
with self.assertRaisesRegex(RuntimeError, "no daemon"):
|
||||
with self.assertRaisesRegex(EnumerationError, "no daemon"):
|
||||
list_active_slugs(
|
||||
warn_on_error=False,
|
||||
raise_on_error=True,
|
||||
|
||||
@@ -28,6 +28,7 @@ from unittest.mock import patch
|
||||
from tests.unit import use_bottle_root
|
||||
from bot_bottle import bottle_state
|
||||
from bot_bottle.backend.docker import enumerate as _enumerate
|
||||
from bot_bottle.backend import EnumerationError
|
||||
|
||||
|
||||
class TestParseServicesByProject(unittest.TestCase):
|
||||
@@ -82,7 +83,7 @@ class TestQueryServicesByProject(unittest.TestCase):
|
||||
args=["docker"], returncode=1, stdout="", stderr="daemon down",
|
||||
),
|
||||
):
|
||||
with self.assertRaisesRegex(RuntimeError, "daemon down"):
|
||||
with self.assertRaisesRegex(EnumerationError, "daemon down"):
|
||||
_enumerate._query_services_by_project()
|
||||
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ from __future__ import annotations
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
from bot_bottle.backend import EnumerationError
|
||||
from bot_bottle.backend.macos_container import cleanup, enumerate as enum_mod
|
||||
from bot_bottle.backend.macos_container.bottle_cleanup_plan import (
|
||||
MacosContainerBottleCleanupPlan,
|
||||
@@ -69,10 +70,18 @@ class TestMacosContainerEnumerate(unittest.TestCase):
|
||||
self.assertEqual(["dev-abc"], [a.slug for a in agents])
|
||||
|
||||
def test_raises_when_the_cli_fails(self):
|
||||
from bot_bottle.backend.macos_container.enumerate import EnumerationError
|
||||
with self.assertRaises(EnumerationError):
|
||||
self._enumerate("", returncode=1)
|
||||
|
||||
def test_raises_typed_error_when_cli_is_missing(self):
|
||||
with (
|
||||
patch.object(
|
||||
enum_mod.subprocess, "run", side_effect=FileNotFoundError,
|
||||
),
|
||||
self.assertRaisesRegex(EnumerationError, "CLI not found"),
|
||||
):
|
||||
enum_mod.enumerate_active()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user