e2e: use dockercontroller to test proxy
This commit is contained in:
@ -35,11 +35,7 @@ class BaseController:
|
||||
"""Call .up() but capture all log output and return it."""
|
||||
with capture_logs() as logs:
|
||||
self.up()
|
||||
log_messages = []
|
||||
for log in logs:
|
||||
self.logger.debug(**log)
|
||||
log_messages.append(f"{log['controller']}: {log['event']}")
|
||||
return log_messages
|
||||
return [f"{x['controller']}: {x['event']}" for x in logs]
|
||||
|
||||
def down(self):
|
||||
"""Handler to delete everything we've created"""
|
||||
|
||||
@ -118,7 +118,7 @@ class DockerController(BaseController):
|
||||
try:
|
||||
container, _ = self._get_container()
|
||||
container.kill()
|
||||
container.remove(force=True)
|
||||
container.remove()
|
||||
except DockerException as exc:
|
||||
raise ControllerException from exc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user