homelab/traefik
1
0
Fork 0
Code Activity

Merge branch v2.11 into v3.4

Browse source
This commit is contained in:
romain 2025-06-02 11:38:16 +02:00
commit bd4bfd8919
110 changed files with 493 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pkg/provider/nomad/config_test.go
View file

@ -1,7 +1,6 @@
package nomad
import (
"context"
"testing"
"time"
@ -251,8 +250,7 @@ func Test_defaultRule(t *testing.T) {
err := p.Init()
require.NoError(t, err)
ctx := context.TODO()
config := p.buildConfig(ctx, test.items)
config := p.buildConfig(t.Context(), test.items)
require.Equal(t, test.expected, config)
})
}
@ -3077,8 +3075,7 @@ func Test_buildConfig(t *testing.T) {
err := p.Init()
require.NoError(t, err)
ctx := context.TODO()
c := p.buildConfig(ctx, test.items)
c := p.buildConfig(t.Context(), test.items)
require.Equal(t, test.expected, c)
})
}
@ -3246,8 +3243,7 @@ func Test_buildConfigAllowEmptyServicesTrue(t *testing.T) {
err := p.Init()
require.NoError(t, err)
ctx := context.TODO()
c := p.buildConfig(ctx, test.items)
c := p.buildConfig(t.Context(), test.items)
require.Equal(t, test.expected, c)
})
}
@ -3379,8 +3375,7 @@ func Test_buildConfigAllowEmptyServicesFalseDefault(t *testing.T) {
err := p.Init()
require.NoError(t, err)
ctx := context.TODO()
c := p.buildConfig(ctx, test.items)
c := p.buildConfig(t.Context(), test.items)
require.Equal(t, test.expected, c)
})
}
@ -3428,8 +3423,8 @@ func Test_keepItem(t *testing.T) {
p := new(Provider)
p.SetDefaults()
p.Constraints = test.constraints
ctx := context.TODO()
result := p.keepItem(ctx, test.i)
result := p.keepItem(t.Context(), test.i)
require.Equal(t, test.exp, result)
})
}

21
pkg/provider/nomad/nomad_test.go
View file

@ -1,7 +1,6 @@
package nomad
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@ -170,7 +169,7 @@ func Test_getNomadServiceDataWithEmptyServices_GroupService_Scaling1(t *testing.
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
require.Len(t, items, 1)
}
@ -200,7 +199,7 @@ func Test_getNomadServiceDataWithEmptyServices_GroupService_Scaling0(t *testing.
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
require.Len(t, items, 1)
}
@ -230,7 +229,7 @@ func Test_getNomadServiceDataWithEmptyServices_GroupService_ScalingDisabled(t *t
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
require.Len(t, items, 1)
}
@ -260,7 +259,7 @@ func Test_getNomadServiceDataWithEmptyServices_GroupService_ScalingDisabled_Stop
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
// Should not be listed as job is stopped
@ -294,7 +293,7 @@ func Test_getNomadServiceDataWithEmptyServices_GroupTaskService_Scaling1(t *test
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
require.Len(t, items, 2)
}
@ -326,7 +325,7 @@ func Test_getNomadServiceDataWithEmptyServices_GroupTaskService_Scaling0(t *test
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
require.Len(t, items, 2)
}
@ -356,7 +355,7 @@ func Test_getNomadServiceDataWithEmptyServices_TCP(t *testing.T) {
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
require.Len(t, items, 1)
}
@ -386,7 +385,7 @@ func Test_getNomadServiceDataWithEmptyServices_UDP(t *testing.T) {
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
require.Len(t, items, 1)
}
@ -416,7 +415,7 @@ func Test_getNomadServiceDataWithEmptyServices_ScalingEnabled_Stopped(t *testing
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceDataWithEmptyServices(context.TODO())
items, err := p.getNomadServiceDataWithEmptyServices(t.Context())
require.NoError(t, err)
// Should not be listed as job is stopped
@ -465,7 +464,7 @@ func Test_getNomadServiceData(t *testing.T) {
require.NoError(t, err)
// make the query for services
items, err := p.getNomadServiceData(context.TODO())
items, err := p.getNomadServiceData(t.Context())
require.NoError(t, err)
require.Len(t, items, 2)
}