diff --git a/hook/main_test.go b/hook/main_test.go index 4211c28283b4fdcfbc6f0f4b275261532d5d64df..8f52ca5db8a4b84d54f5d0a89d27a5a7eb53c2a7 100644 --- a/hook/main_test.go +++ b/hook/main_test.go @@ -23,7 +23,8 @@ import ( ) const ( - pidSample = 123 + pidSample = 123 + fileMode0600 os.FileMode = 0600 ) func TestDoPrestartHookCase1(t *testing.T) { @@ -148,6 +149,10 @@ func TestParseOciSpecFileCase2(t *testing.T) { if err != nil { t.Log("create file failed") } + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) + } _, err = parseOciSpecFile(file) if err == nil { t.Fail() diff --git a/mindxcheckutils/mindxcheckutils_test.go b/mindxcheckutils/mindxcheckutils_test.go index 1d19a29c95300eb56491ee6ad0424dbdfb4ee770..036a39bef4742e53f2d30fcfaafb587199a3f897 100644 --- a/mindxcheckutils/mindxcheckutils_test.go +++ b/mindxcheckutils/mindxcheckutils_test.go @@ -21,6 +21,10 @@ import ( "testing" ) +const ( + fileMode0600 os.FileMode = 0600 +) + func TestNormalFileCheckRegularFile(t *testing.T) { tmpDir, filePath, err := createTestFile(t, "test_file.txt") defer removeTmpDir(t, tmpDir) @@ -155,10 +159,14 @@ func createTestFile(t *testing.T, fileName string) (string, string, error) { if os.MkdirAll(tmpDir+"/__test__", permission) != nil { t.Fatalf("MkdirAll failed %q", tmpDir+"/__test__") } - _, err := os.Create(tmpDir + "/__test__" + fileName) + f, err := os.Create(tmpDir + "/__test__" + fileName) if err != nil { t.Fatalf("create file failed %q: %s", tmpDir+"/__test__", err) } + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) + } return tmpDir + "/__test__", tmpDir + "/__test__" + fileName, err } diff --git a/runtime/main.go b/runtime/main.go index 9802adb509aee86dfbfbfba14f794dcbed5d7865..5ec3e76ab7bd69e16f630e1d2f508c8dfdbda793 100644 --- a/runtime/main.go +++ b/runtime/main.go @@ -403,8 +403,8 @@ func addDeviceToSpec(spec *specs.Spec, dPath string, deviceType string) error { device.Path = devicePath + davinciName + vDeviceNumber[0] case davinciManagerDocker: device.Path = devicePath + davinciManager - default: - // do nothing + default: // do nothing + } spec.Linux.Devices = append(spec.Linux.Devices, *device) diff --git a/runtime/main_test.go b/runtime/main_test.go index 64fb48508a505e888008edae4bc122b785206c02..ed4dfd98d7338f95f43d4b0e9ca3091070091b28 100644 --- a/runtime/main_test.go +++ b/runtime/main_test.go @@ -34,7 +34,11 @@ const ( // strKubeDNSPort53UDPPort represents the string of the environment variable KUBE_DNS_PORT_53_UDP_PORT strKubeDNSPort53UDPPort = "KUBE_DNS_PORT_53_UDP_PORT=53" // strKubeDNSPort53UDPProto represents the string of the environment variable KUBE_DNS_PORT_53_UDP_PROTO - strKubeDNSPort53UDPProto = "KUBE_DNS_PORT_53_UDP_PROTO=udp" + strKubeDNSPort53UDPProto = "KUBE_DNS_PORT_53_UDP_PROTO=udp" + fileMode0400 os.FileMode = 0400 + fileMode0600 os.FileMode = 0600 + fileMode0655 os.FileMode = 0655 + needToMkdir = "./test" ) func TestArgsIsCreate(t *testing.T) { @@ -88,13 +92,19 @@ func TestArgsIsCreateCase2(t *testing.T) { func TestArgsIsCreateCase3(t *testing.T) { t.Log("进入测试用例") - if err := os.Mkdir("./test", 0655); err != nil { + if err := os.Mkdir(needToMkdir, fileMode0655); err != nil { + t.Fatalf("failed to create file, error: %v", err) } f, err := os.Create("./test/config.json") defer f.Close() if err != nil { + t.Logf("create file error: %v", err) } - testArgs := []string{"create", "--bundle", "./test"} + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) + } + testArgs := []string{"create", "--bundle", needToMkdir} stub := gomonkey.ApplyGlobalVar(&os.Args, testArgs) defer stub.Reset() @@ -110,13 +120,19 @@ func TestArgsIsCreateCase3(t *testing.T) { func TestArgsIsCreateCase4(t *testing.T) { t.Log("进入测试用例") - if err := os.Mkdir("./test", 0655); err != nil { + if err := os.Mkdir(needToMkdir, fileMode0655); err != nil { + t.Fatalf("failed to create file, error: %v", err) } f, err := os.Create("./test/config.json") defer f.Close() if err != nil { + t.Logf("create file failed, error: %v", err) } - testArgs := []string{"spec", "--bundle", "./test"} + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file failed, error: %v", err) + } + testArgs := []string{"spec", "--bundle", needToMkdir} stub := gomonkey.ApplyGlobalVar(&os.Args, testArgs) defer stub.Reset() @@ -135,15 +151,14 @@ func TestModifySpecFile(t *testing.T) { } func TestModifySpecFileCase1(t *testing.T) { - file := "./test" - if err := os.Mkdir("./test", 0400); err != nil { - + if err := os.Mkdir(needToMkdir, fileMode0400); err != nil { + t.Logf("mkdir error: %v", err) } - err := modifySpecFile(file) + err := modifySpecFile(needToMkdir) assert.NotNil(t, err) - if err := os.Remove(file); err != nil { - + if err := os.Remove(needToMkdir); err != nil { + t.Logf("failed to remove dir, error: %v", err) } } @@ -154,7 +169,10 @@ func TestModifySpecFileCase2(t *testing.T) { if err != nil { t.Log("create file error") } - + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) + } if err := modifySpecFile(file); err != nil { t.Log("run modifySpecFile failed") }