fix merge

canonical · Sep 5, 2024 · 10a2f5c · 10a2f5c
1 parent 2c86775
commit 10a2f5c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 221 deletions.
diff --git a/src/manager/cloud_runner_manager.py b/src/manager/cloud_runner_manager.py
diff --git a/src/manager/runner_manager.py b/src/manager/runner_manager.py
diff --git a/src/manager/runner_scaler.py b/src/manager/runner_scaler.py
diff --git a/src/metrics/github.py b/src/metrics/github.py
diff --git a/tests/integration/helpers/openstack.py b/tests/integration/helpers/openstack.py
@@ -12,7 +12,6 @@
 from openstack.compute.v2.server import Server
 
 from charm_state import VIRTUAL_MACHINES_CONFIG_NAME
-from openstack_cloud.openstack_cloud import OpenstackCloud
 from tests.integration.helpers.common import InstanceHelper, reconcile, run_in_unit, wait_for
 
 logger = logging.getLogger(__name__)

diff --git a/tests/unit/mock_runner_managers.py b/tests/unit/mock_runner_managers.py
@@ -7,9 +7,6 @@
 from typing import Iterable, Iterator, Sequence
 from unittest.mock import MagicMock
 
-from charm_state import GitHubPath
-from github_client import GithubClient
-from github_type import GitHubRunnerStatus, SelfHostedRunner
 from manager.cloud_runner_manager import (
     CloudRunnerInstance,
     CloudRunnerManager,
@@ -18,6 +15,10 @@
 )
 from manager.github_runner_manager import GitHubRunnerState
 from metrics.runner import RunnerMetrics
+
+from charm_state import GitHubPath
+from github_client import GithubClient
+from github_type import GitHubRunnerStatus, SelfHostedRunner
 from tests.unit.mock import MockGhapiClient
 
 

diff --git a/tests/unit/test_runner_scaler.py b/tests/unit/test_runner_scaler.py
@@ -6,12 +6,12 @@
 from unittest.mock import MagicMock
 
 import pytest
-
-from charm_state import GitHubPath, GitHubRepo
 from manager.cloud_runner_manager import CloudRunnerState, InstanceId
 from manager.github_runner_manager import GitHubRunnerState
 from manager.runner_manager import FlushMode, RunnerManager, RunnerManagerConfig
 from manager.runner_scaler import RunnerScaler
+
+from charm_state import GitHubPath, GitHubRepo
 from tests.unit.mock_runner_managers import (
     MockCloudRunnerManager,
     MockGitHubRunnerManager,