opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 11:08:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16581 from mtrmac/modified-test

Browse Source 
Update c/storage after https://github.com/containers/storage/pull/1436
This commit is contained in:
OpenShift Merge Robot
2022-12-05 13:16:57 -05:00
committed by GitHub
parent 41af424cd8 c83efd0f07
commit c942f77887
23 changed files with 531 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/common_test.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/containers/podman/v4/pkg/rootless"
"github.com/containers/podman/v4/pkg/util"
. "github.com/containers/podman/v4/test/utils"
"github.com/containers/storage"
"github.com/containers/storage/pkg/lockfile"
"github.com/containers/storage/pkg/reexec"
"github.com/containers/storage/pkg/stringid"
jsoniter "github.com/json-iterator/go"
@@ -402,9 +402,9 @@ func processTestResult(f GinkgoTestDescription) {
testResultsMutex.Unlock()
}
func GetPortLock(port string) storage.Locker {
func GetPortLock(port string) *lockfile.LockFile {
lockFile := filepath.Join(LockTmpDir, port)
lock, err := storage.GetLockfile(lockFile)
lock, err := lockfile.GetLockFile(lockFile)
if err != nil {
fmt.Println(err)
os.Exit(1)