From ca0470f01af0717c52b098dc8e03a706fa39a376 Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Tue, 1 Jul 2025 12:06:59 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpingtest=E5=92=8Cspeed?= =?UTF-8?q?test=E5=9C=A8=E6=97=A0root=E6=9D=83=E9=99=90=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E9=89=B4=E6=9D=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- disktest/disktest.go | 3 ++- go.mod | 4 ++-- go.sum | 8 ++++---- goecs.go | 10 ++++------ memorytest/memorytest.go | 3 ++- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/disktest/disktest.go b/disktest/disktest.go index b56bde4..c0e332b 100644 --- a/disktest/disktest.go +++ b/disktest/disktest.go @@ -29,7 +29,8 @@ func DiskTest(language, testMethod, testPath string, isMultiCheck bool, autoChan res += disk.FioTest(language, isMultiCheck, testPath) } default: - res = "Unsupported test method specified.\n" + res = "Unsupported test method specified, switching to DD for testing.\n" + res += disk.DDTest(language, isMultiCheck, testPath) } } //fmt.Println("--------------------------------------------------") diff --git a/go.mod b/go.mod index f22250b..bad76d6 100644 --- a/go.mod +++ b/go.mod @@ -14,12 +14,12 @@ require ( github.com/oneclickvirt/defaultset v0.0.2-20240624082446 github.com/oneclickvirt/disktest v0.0.8-20250701092629 github.com/oneclickvirt/gostun v0.0.3-20250329105202 - github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701022859-5967f9d8d3eb + github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701113027-9edfc91f68e6 github.com/oneclickvirt/nt3 v0.0.5-20250416131047 github.com/oneclickvirt/pingtest v0.0.7-20250413051539 github.com/oneclickvirt/portchecker v0.0.3-20250329125750 github.com/oneclickvirt/security v0.0.4-20250629033626 - github.com/oneclickvirt/speedtest v0.0.9-20250521034111 + github.com/oneclickvirt/speedtest v0.0.10-20250701114947 ) require ( diff --git a/go.sum b/go.sum index 5a53bac..06856a7 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/oneclickvirt/gostun v0.0.3-20250329105202 h1:aJ6E91Lp94lq8iWRcCaxpXTj github.com/oneclickvirt/gostun v0.0.3-20250329105202/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA= github.com/oneclickvirt/mbw v0.0.1-20250630140849 h1:p6RMhOPBnQKAm9+VEQ2axAFsidrdSdrhXMyheIyv2a8= github.com/oneclickvirt/mbw v0.0.1-20250630140849/go.mod h1:0Vq6NRpyLmGUdfHfL3uDcFsuZhi7KlG+OCs5ky2757Y= -github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701022859-5967f9d8d3eb h1:EKYQWLw4um/C2xm6z8aDl+owWtvaIp0z7nlyMj62kkk= -github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701022859-5967f9d8d3eb/go.mod h1:7xMacjQobvFAtODht2hxTsB9hM2IFS7vZk3gxx+bsjo= +github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701113027-9edfc91f68e6 h1:78/eMk+FGeDxxpKgkTb4GF5KJe76y8UW7Htcwm2hF9I= +github.com/oneclickvirt/memorytest v0.0.6-20250630141424.0.20250701113027-9edfc91f68e6/go.mod h1:7xMacjQobvFAtODht2hxTsB9hM2IFS7vZk3gxx+bsjo= github.com/oneclickvirt/nt3 v0.0.5-20250416131047 h1:KL0xowq19cW+FMBGMJxdqpRNoeyR+eEmb+jYSubmlTk= github.com/oneclickvirt/nt3 v0.0.5-20250416131047/go.mod h1:CVsDJEaIdyyZHn3WKbhU8Wn6GOfmBNvJlC/dDLRqcSQ= github.com/oneclickvirt/pingtest v0.0.7-20250413051539 h1:mYOsEmMtwKr40hwM2NimVLpnbR2cjwuOh1c/9fQr2Dw= @@ -129,8 +129,8 @@ github.com/oneclickvirt/portchecker v0.0.3-20250329125750 h1:TTNL0pnQlRsn046kW59 github.com/oneclickvirt/portchecker v0.0.3-20250329125750/go.mod h1:HQxSTrqM8/QFqHMTBZ7S8H9eEO5FkUXU1eb7ZX5Mk+k= github.com/oneclickvirt/security v0.0.4-20250629033626 h1:DEchQ7WKKz4CzQpMlweoqA993BGncvmp1rL1ICNDJ2g= github.com/oneclickvirt/security v0.0.4-20250629033626/go.mod h1:/5eVnZLvP7RUjwhoI6d8iIMP7msbkHC5So3ZxM+A7Zg= -github.com/oneclickvirt/speedtest v0.0.9-20250521034111 h1:yygDk+s5qFhPMDRzdMfyopm1xU512peNqY6WYyvYcfY= -github.com/oneclickvirt/speedtest v0.0.9-20250521034111/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI= +github.com/oneclickvirt/speedtest v0.0.10-20250701114947 h1:e6qBjCqbuFA4391JmOQM/CND1vzDQCDfbN4yX6QbBKA= +github.com/oneclickvirt/speedtest v0.0.10-20250701114947/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI= github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM= github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= diff --git a/goecs.go b/goecs.go index ae897be..bfcb0d5 100644 --- a/goecs.go +++ b/goecs.go @@ -39,7 +39,7 @@ import ( ) var ( - ecsVersion = "v0.1.48" + ecsVersion = "v0.1.49" menuMode bool onlyChinaTest bool input, choice string @@ -351,10 +351,8 @@ func setHardwareOnlyTestStatus(preCheck utils.NetCheckResult) { cpuTestStatus = true memoryTestStatus = true diskTestStatus = true - if preCheck.Connected { - securityTestStatus = false - autoChangeDiskTestMethod = false - } + securityTestStatus = false + autoChangeDiskTestMethod = false } func setIPQualityTestStatus() { @@ -511,7 +509,7 @@ func runEnglishTests(preCheck utils.NetCheckResult, wg1, wg2 *sync.WaitGroup, ba *emailInfo = email.EmailCheck() }() } - output = runStreamingTests(wg1, mediaInfo, output, tempOutput, outputMutex) // 传递指针 + output = runStreamingTests(wg1, mediaInfo, output, tempOutput, outputMutex) // 传递指针 output = runSecurityTests(*securityInfo, output, tempOutput, outputMutex) output = runEmailTests(wg2, emailInfo, output, tempOutput, outputMutex) output = runEnglishSpeedTests(output, tempOutput, outputMutex) diff --git a/memorytest/memorytest.go b/memorytest/memorytest.go index 4b9591e..008cda5 100644 --- a/memorytest/memorytest.go +++ b/memorytest/memorytest.go @@ -25,7 +25,8 @@ func MemoryTest(language, testMethod string) { case "dd": res = memory.DDTest(language) default: - res = "Unsupported test method" + res = "Unsupported test method, switch to use dd test.\n" + res += memory.DDTest(language) } } if !strings.Contains(res, "\n") && res != "" {