github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9016 from djdongjin/remove-most-logrus

Browse Source 
Remove most logrus import
This commit is contained in:
Akihiro Suda
2023-09-05 16:09:12 +09:00
committed by GitHub
parent 817391989f fc45365fa1
commit e30a40eb65
31 changed files with 84 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/images/image_list.go
View File

@@ -22,8 +22,8 @@ import (
"os"
"sync"
"github.com/containerd/containerd/log"
"github.com/pelletier/go-toml"
"github.com/sirupsen/logrus"
)
var imageListFile = flag.String("image-list", "", "The TOML file containing the non-default images to be used in tests.")
@@ -58,7 +58,7 @@ func initImages(imageListFile string) {
}
if imageListFile != "" {
logrus.Infof("loading image list from file: %s", imageListFile)
log.L.Infof("loading image list from file: %s", imageListFile)
fileContent, err := os.ReadFile(imageListFile)
if err != nil {
@@ -71,7 +71,7 @@ func initImages(imageListFile string) {
}
}
logrus.Infof("Using the following image list: %+v", imageList)
log.L.Infof("Using the following image list: %+v", imageList)
imageMap = initImageMap(imageList)
}

4
integration/main_test.go
View File

@@ -39,12 +39,12 @@ import (
_ "github.com/containerd/containerd/integration/images" // Keep this around to parse `imageListFile` command line var
"github.com/containerd/containerd/integration/remote"
dialer "github.com/containerd/containerd/integration/remote/util"
"github.com/containerd/containerd/log"
criconfig "github.com/containerd/containerd/pkg/cri/config"
"github.com/containerd/containerd/pkg/cri/constants"
"github.com/containerd/containerd/pkg/cri/server"
"github.com/containerd/containerd/pkg/cri/util"
"github.com/opencontainers/selinux/go-selinux"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
exec "golang.org/x/sys/execabs"
@@ -72,7 +72,7 @@ var containerdBin = flag.String("containerd-bin", "containerd", "The containerd
func TestMain(m *testing.M) {
flag.Parse()
if err := ConnectDaemons(); err != nil {
logrus.WithError(err).Fatalf("Failed to connect daemons")
log.L.WithError(err).Fatalf("Failed to connect daemons")
}
os.Exit(m.Run())
}