From 316e37dc13e2a9b79b10d4df85d61b3d99134b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Thu, 1 Aug 2024 09:36:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91clean=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hook/process/process_test.go | 7 ++++--- runtime/dcmi/dcmi_api_test.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hook/process/process_test.go b/hook/process/process_test.go index 1cb5ff5..f532193 100644 --- a/hook/process/process_test.go +++ b/hook/process/process_test.go @@ -304,9 +304,10 @@ func TestDoPrestartHook(t *testing.T) { return &fileInfoMock{}, nil }) defer patch.Reset() - patchReadConfigsOfDir := gomonkey.ApplyFunc(readConfigsOfDir, func(dir string, configs []string) ([]string, []string, error) { - return []string{}, []string{}, nil - }) + patchReadConfigsOfDir := gomonkey.ApplyFunc(readConfigsOfDir, + func(dir string, configs []string) ([]string, []string, error) { + return []string{}, []string{}, nil + }) defer patchReadConfigsOfDir.Reset() patchSize := gomonkey.ApplyMethod(reflect.TypeOf(&fileInfoMock{}), "Mode", func(f *fileInfoMock) fs.FileMode { return fs.ModeDir diff --git a/runtime/dcmi/dcmi_api_test.go b/runtime/dcmi/dcmi_api_test.go index 0cf987f..a60b89f 100644 --- a/runtime/dcmi/dcmi_api_test.go +++ b/runtime/dcmi/dcmi_api_test.go @@ -85,7 +85,7 @@ func TestCreateVDevice(t *testing.T) { } // no split, all ok - var deviceIdList []int + deviceIdList := make([]int, 0) vdevice, err := CreateVDevice(&mockWorker{}, &spec, deviceIdList) if err != nil { t.Fatalf("%v %v", vdevice, err) -- Gitee From 900dd3fd1904bdf22a4cca52d6fc4a0f3ad53275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Thu, 1 Aug 2024 16:02:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91add=20error=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/main.go | 2 +- install/process/docker_process.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/main.go b/install/main.go index 571c692..38fe600 100644 --- a/install/main.go +++ b/install/main.go @@ -100,7 +100,7 @@ func main() { } if err != nil { hwlog.RunLog.Errorf("%v run script failed: %v", logPrefixWords, err) - log.Fatal(fmt.Errorf("error in installation")) + log.Fatal(fmt.Errorf("error in installation, err is %v", err)) } hwlog.RunLog.Infof("%v run %v success", logPrefixWords, behavior) } diff --git a/install/process/docker_process.go b/install/process/docker_process.go index 67b99c9..5c5f88b 100644 --- a/install/process/docker_process.go +++ b/install/process/docker_process.go @@ -184,7 +184,7 @@ func loadOriginJson(srcFilePath string) (map[string]interface{}, error) { file, err := os.Open(srcFilePath) if err != nil { - return nil, fmt.Errorf("open daemon.json failed") + return nil, fmt.Errorf("open daemon.json failed, err: %v", err) } content, err := ioutil.ReadAll(file) if err != nil { @@ -193,13 +193,13 @@ func loadOriginJson(srcFilePath string) (map[string]interface{}, error) { } err = file.Close() if err != nil { - return nil, fmt.Errorf("close daemon.json failed") + return nil, fmt.Errorf("close daemon.json failed, err: %v", err) } var daemon map[string]interface{} err = json.Unmarshal(content, &daemon) if err != nil { - return nil, fmt.Errorf("load daemon.json failed") + return nil, fmt.Errorf("load daemon.json failed, err: %v", err) } return daemon, nil } -- Gitee