Fix imports

Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com>
armadaproject · Sep 23, 2024 · a7a5247 · a7a5247
1 parent 3e62be1
commit a7a5247
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/internal/scheduler/metrics/cycle_metrics.go b/internal/scheduler/metrics/cycle_metrics.go
@@ -3,8 +3,9 @@ package metrics
 import (
 	"time"
 
-	"github.com/armadaproject/armada/internal/scheduler/scheduling"
 	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/armadaproject/armada/internal/scheduler/scheduling"
 )
 
 var (

diff --git a/internal/scheduler/metrics/cycle_metrics_test.go b/internal/scheduler/metrics/cycle_metrics_test.go
@@ -4,17 +4,18 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/armadaproject/armada/internal/scheduler/configuration"
-	"github.com/armadaproject/armada/internal/scheduler/schedulerobjects"
-	"github.com/armadaproject/armada/internal/scheduler/scheduling"
-	context2 "github.com/armadaproject/armada/internal/scheduler/scheduling/context"
-	"github.com/armadaproject/armada/internal/scheduler/scheduling/fairness"
-	"github.com/armadaproject/armada/internal/scheduler/testfixtures"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/api/resource"
+
+	"github.com/armadaproject/armada/internal/scheduler/configuration"
+	"github.com/armadaproject/armada/internal/scheduler/schedulerobjects"
+	"github.com/armadaproject/armada/internal/scheduler/scheduling"
+	"github.com/armadaproject/armada/internal/scheduler/scheduling/context"
+	"github.com/armadaproject/armada/internal/scheduler/scheduling/fairness"
+	"github.com/armadaproject/armada/internal/scheduler/testfixtures"
 )
 
 const epsilon = 1e-6
@@ -25,25 +26,25 @@ func TestReportStateTransitions(t *testing.T) {
 		configuration.SchedulingConfig{DominantResourceFairnessResourcesToConsider: []string{"cpu"}})
 	require.NoError(t, err)
 	result := scheduling.SchedulerResult{
-		SchedulingContexts: []*context2.SchedulingContext{
+		SchedulingContexts: []*context.SchedulingContext{
 			{
 				Pool:                 "pool1",
 				FairnessCostProvider: fairnessCostProvider,
-				QueueSchedulingContexts: map[string]*context2.QueueSchedulingContext{
+				QueueSchedulingContexts: map[string]*context.QueueSchedulingContext{
 					"queue1": {
 						Allocated:         cpu(10),
 						Demand:            cpu(20),
 						CappedDemand:      cpu(15),
 						AdjustedFairShare: 0.15,
-						SuccessfulJobSchedulingContexts: map[string]*context2.JobSchedulingContext{
+						SuccessfulJobSchedulingContexts: map[string]*context.JobSchedulingContext{
 							"job1": {
 								Job: testfixtures.Test1Cpu4GiJob("queue1", testfixtures.PriorityClass0),
 							},
 							"job2": {
 								Job: testfixtures.Test1Cpu4GiJob("queue1", testfixtures.PriorityClass0),
 							},
 						},
-						UnsuccessfulJobSchedulingContexts: map[string]*context2.JobSchedulingContext{
+						UnsuccessfulJobSchedulingContexts: map[string]*context.JobSchedulingContext{
 							"job2": {
 								Job: testfixtures.Test1Cpu4GiJob("queue1", testfixtures.PriorityClass0),
 							},