Skip to content

Commit b815dd7

Browse files
authored
Merge pull request #545 from masnax/os-detect
Use Incus guest OS determination
2 parents a8eae23 + 50c2fff commit b815dd7

17 files changed

Lines changed: 227 additions & 420 deletions

File tree

cmd/migration-manager-worker/worker_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717

1818
"github.com/google/uuid"
1919
incusAPI "github.com/lxc/incus/v7/shared/api"
20+
"github.com/lxc/incus/v7/shared/osinfo"
2021
"github.com/lxc/incus/v7/shared/subprocess"
2122
"github.com/stretchr/testify/require"
2223

@@ -34,7 +35,7 @@ var errGracefulEndOfTest = fmt.Errorf("graceful end of test")
3435
type instanceDetails struct {
3536
Location string
3637
OSType api.OSType
37-
Distro api.Distro
38+
Distro osinfo.Distro
3839
DistroVersion string
3940
}
4041

@@ -291,7 +292,7 @@ func TestRun(t *testing.T) {
291292
},
292293
instanceSpec: instanceDetails{
293294
OSType: api.OSTYPE_WINDOWS,
294-
Distro: api.DISTRO_OTHER,
295+
Distro: osinfo.OtherDistro,
295296
DistroVersion: "invalid",
296297
},
297298

go.mod

Lines changed: 22 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)