From 3ba9a5b4f5e6ca60b26b52a7409b78af5d0aa02b Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Tue, 4 May 2021 19:13:52 +0100 Subject: [PATCH] Refine geodata related tests (#967) (cherry picked from commit 7805ca2ac1c806f8d6adf4a0e972b2543fb39060) --- app/router/condition_geoip_test.go | 16 ++++----- app/router/condition_test.go | 31 +++++++--------- infra/conf/dns_test.go | 31 +++++++--------- .../geodata/memconservative/decode_test.go | 35 ++++++++----------- 4 files changed, 48 insertions(+), 65 deletions(-) diff --git a/app/router/condition_geoip_test.go b/app/router/condition_geoip_test.go index 2996b1794..00fe21fb7 100644 --- a/app/router/condition_geoip_test.go +++ b/app/router/condition_geoip_test.go @@ -22,17 +22,15 @@ func init() { common.Must(err) tempPath := filepath.Join(wd, "..", "..", "testing", "temp") - geoipPath := filepath.Join(tempPath, "geoip.dat") - os.Setenv("v2ray.location.asset", tempPath) - if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) { - if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { - common.Must(os.MkdirAll(tempPath, 0755)) - geoipBytes, err := common.FetchHTTPContent(geoipURL) - common.Must(err) - common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) - } + geoipPath := platform.GetAssetLocation("geoip.dat") + + if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { + common.Must(os.MkdirAll(tempPath, 0755)) + geoipBytes, err := common.FetchHTTPContent(geoipURL) + common.Must(err) + common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) } } diff --git a/app/router/condition_test.go b/app/router/condition_test.go index 363fafb52..de346e07b 100644 --- a/app/router/condition_test.go +++ b/app/router/condition_test.go @@ -28,27 +28,22 @@ func init() { common.Must(err) tempPath := filepath.Join(wd, "..", "..", "testing", "temp") - geoipPath := filepath.Join(tempPath, "geoip.dat") - geositePath := filepath.Join(tempPath, "geosite.dat") - os.Setenv("v2ray.location.asset", tempPath) - if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) { - if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { - common.Must(os.MkdirAll(tempPath, 0755)) - geoipBytes, err := common.FetchHTTPContent(geoipURL) - common.Must(err) - common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) - } - } + geoipPath := platform.GetAssetLocation("geoip.dat") + geositePath := platform.GetAssetLocation("geosite.dat") - if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, fs.ErrNotExist) { - if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) { - common.Must(os.MkdirAll(tempPath, 0755)) - geositeBytes, err := common.FetchHTTPContent(geositeURL) - common.Must(err) - common.Must(filesystem.WriteFile(geositePath, geositeBytes)) - } + if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { + common.Must(os.MkdirAll(tempPath, 0755)) + geoipBytes, err := common.FetchHTTPContent(geoipURL) + common.Must(err) + common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) + } + if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) { + common.Must(os.MkdirAll(tempPath, 0755)) + geositeBytes, err := common.FetchHTTPContent(geositeURL) + common.Must(err) + common.Must(filesystem.WriteFile(geositePath, geositeBytes)) } } diff --git a/infra/conf/dns_test.go b/infra/conf/dns_test.go index 01cffdde3..87088d29e 100644 --- a/infra/conf/dns_test.go +++ b/infra/conf/dns_test.go @@ -25,27 +25,22 @@ func init() { common.Must(err) tempPath := filepath.Join(wd, "..", "..", "testing", "temp") - geoipPath := filepath.Join(tempPath, "geoip.dat") - geositePath := filepath.Join(tempPath, "geosite.dat") - os.Setenv("v2ray.location.asset", tempPath) - if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) { - if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { - common.Must(os.MkdirAll(tempPath, 0755)) - geoipBytes, err := common.FetchHTTPContent(geoipURL) - common.Must(err) - common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) - } - } + geoipPath := platform.GetAssetLocation("geoip.dat") + geositePath := platform.GetAssetLocation("geosite.dat") - if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, fs.ErrNotExist) { - if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) { - common.Must(os.MkdirAll(tempPath, 0755)) - geositeBytes, err := common.FetchHTTPContent(geositeURL) - common.Must(err) - common.Must(filesystem.WriteFile(geositePath, geositeBytes)) - } + if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { + common.Must(os.MkdirAll(tempPath, 0755)) + geoipBytes, err := common.FetchHTTPContent(geoipURL) + common.Must(err) + common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) + } + if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) { + common.Must(os.MkdirAll(tempPath, 0755)) + geositeBytes, err := common.FetchHTTPContent(geositeURL) + common.Must(err) + common.Must(filesystem.WriteFile(geositePath, geositeBytes)) } } diff --git a/infra/conf/geodata/memconservative/decode_test.go b/infra/conf/geodata/memconservative/decode_test.go index fda5b7ce5..189027c02 100644 --- a/infra/conf/geodata/memconservative/decode_test.go +++ b/infra/conf/geodata/memconservative/decode_test.go @@ -1,13 +1,13 @@ package memconservative import ( + "bytes" "errors" "io/fs" "os" "path/filepath" "testing" - "github.com/google/go-cmp/cmp" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" @@ -23,27 +23,22 @@ func init() { common.Must(err) tempPath := filepath.Join(wd, "..", "..", "testing", "temp") - geoipPath := filepath.Join(tempPath, "geoip.dat") - geositePath := filepath.Join(tempPath, "geosite.dat") - os.Setenv("v2ray.location.asset", tempPath) - common.Must(os.MkdirAll(tempPath, 0755)) + geoipPath := platform.GetAssetLocation("geoip.dat") + geositePath := platform.GetAssetLocation("geosite.dat") - if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) { - if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { - geoipBytes, err := common.FetchHTTPContent(geoipURL) - common.Must(err) - common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) - } + if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { + common.Must(os.MkdirAll(tempPath, 0755)) + geoipBytes, err := common.FetchHTTPContent(geoipURL) + common.Must(err) + common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) } - - if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, fs.ErrNotExist) { - if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) { - geositeBytes, err := common.FetchHTTPContent(geositeURL) - common.Must(err) - common.Must(filesystem.WriteFile(geositePath, geositeBytes)) - } + if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) { + common.Must(os.MkdirAll(tempPath, 0755)) + geositeBytes, err := common.FetchHTTPContent(geositeURL) + common.Must(err) + common.Must(filesystem.WriteFile(geositePath, geositeBytes)) } } @@ -55,7 +50,7 @@ func TestDecodeGeoIP(t *testing.T) { } expected := []byte{10, 4, 84, 69, 83, 84, 18, 8, 10, 4, 127, 0, 0, 0, 16, 8} - if cmp.Diff(result, expected) != "" { + if !bytes.Equal(result, expected) { t.Errorf("failed to load geoip:test, expected: %v, got: %v", expected, result) } } @@ -68,7 +63,7 @@ func TestDecodeGeoSite(t *testing.T) { } expected := []byte{10, 4, 84, 69, 83, 84, 18, 20, 8, 3, 18, 16, 116, 101, 115, 116, 46, 101, 120, 97, 109, 112, 108, 101, 46, 99, 111, 109} - if cmp.Diff(result, expected) != "" { + if !bytes.Equal(result, expected) { t.Errorf("failed to load geosite:test, expected: %v, got: %v", expected, result) } }