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

Merge pull request #118177 from HirazawaUi/fix-git-repo-test

Browse Source 
Fix the git-repo test error caused by the correct use of loop variables
This commit is contained in:
Kubernetes Prow Robot
2023-05-26 08:55:04 -07:00
committed by GitHub
parent c35a2775b2 510287d344
commit 719c9fe3f9
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/volume/git_repo/git_repo_test.go
View File

@@ -20,6 +20,7 @@ import (
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
"reflect"
"strings"
@@ -390,10 +391,20 @@ func doTestSetUp(scenario struct {
var fakeOutputs []fakeexec.FakeAction
var fcmd fakeexec.FakeCmd
for _, expected := range expecteds {
expected := expected
if expected.cmd[1] == "clone" {
// Calculate the subdirectory clone would create (if any)
// git clone -- https://github.com/kubernetes/kubernetes.git target_dir --> target_dir
// git clone -- https://github.com/kubernetes/kubernetes.git --> kubernetes
// git clone -- https://github.com/kubernetes/kubernetes.git . --> .
// git clone -- https://github.com/kubernetes/kubernetes.git ./. --> .
cloneSubdir := path.Base(expected.cmd[len(expected.cmd)-1])
if cloneSubdir == "kubernetes.git" {
cloneSubdir = "kubernetes"
}
fakeOutputs = append(fakeOutputs, func() ([]byte, []byte, error) {
// git clone, it creates new dir/files
os.MkdirAll(filepath.Join(fcmd.Dirs[0], expected.dir), 0750)
os.MkdirAll(filepath.Join(fcmd.Dirs[0], expected.dir, cloneSubdir), 0750)
return []byte{}, nil, nil
})
} else {
@@ -422,7 +433,10 @@ func doTestSetUp(scenario struct {
g := mounter.(*gitRepoVolumeMounter)
g.exec = fake
g.SetUp(volume.MounterArgs{})
err := g.SetUp(volume.MounterArgs{})
if err != nil {
allErrs = append(allErrs, err)
}
if fake.CommandCalls != len(expecteds) {
allErrs = append(allErrs,