lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

Revert "Refine geodata related tests (#967)"

Browse Source 
This reverts commit 7805ca2a
This commit is contained in:
Shelikhoo 2021-05-04 19:07:35 +01:00
parent 70245fd30e
commit ace2c44c2b
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
5 changed files with 75 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/router/condition_geoip_test.go
View File

@ -20,15 +20,17 @@ func init() {
common.Must(err) common.Must(err)
tempPath := filepath.Join(wd, "..", "..", "testing", "temp") tempPath := filepath.Join(wd, "..", "..", "testing", "temp")
geoipPath := filepath.Join(tempPath, "geoip.dat")
os.Setenv("v2ray.location.asset", tempPath) os.Setenv("v2ray.location.asset", tempPath)
geoipPath := platform.GetAssetLocation("geoip.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) {
if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { common.Must(os.MkdirAll(tempPath, 0755))
common.Must(os.MkdirAll(tempPath, 0755)) geoipBytes, err := common.FetchHTTPContent(geoipURL)
geoipBytes, err := common.FetchHTTPContent(geoipURL) common.Must(err)
common.Must(err) common.Must(filesystem.WriteFile(geoipPath, geoipBytes))
common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) }
} }
} }

31
app/router/condition_test.go
View File

@ -26,22 +26,27 @@ func init() {
common.Must(err) common.Must(err)
tempPath := filepath.Join(wd, "..", "..", "testing", "temp") tempPath := filepath.Join(wd, "..", "..", "testing", "temp")
geoipPath := filepath.Join(tempPath, "geoip.dat")
geositePath := filepath.Join(tempPath, "geosite.dat")
os.Setenv("v2ray.location.asset", tempPath) os.Setenv("v2ray.location.asset", tempPath)
geoipPath := platform.GetAssetLocation("geoip.dat") if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
geositePath := platform.GetAssetLocation("geosite.dat") if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(os.MkdirAll(tempPath, 0755))
if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { geoipBytes, err := common.FetchHTTPContent(geoipURL)
common.Must(os.MkdirAll(tempPath, 0755)) common.Must(err)
geoipBytes, err := common.FetchHTTPContent(geoipURL) common.Must(filesystem.WriteFile(geoipPath, geoipBytes))
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)) if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
geositeBytes, err := common.FetchHTTPContent(geositeURL) if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(err) common.Must(os.MkdirAll(tempPath, 0755))
common.Must(filesystem.WriteFile(geositePath, geositeBytes)) geositeBytes, err := common.FetchHTTPContent(geositeURL)
common.Must(err)
common.Must(filesystem.WriteFile(geositePath, geositeBytes))
}
} }
} }

36
common/geodata/decode_test.go
View File

@ -1,13 +1,14 @@
package geodata_test package geodata_test
import ( import (
"bytes"
"errors" "errors"
"io/fs" "io/fs"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/google/go-cmp/cmp"
"github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/common/geodata" "github.com/v2fly/v2ray-core/v4/common/geodata"
"github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/common/platform"
@ -24,22 +25,27 @@ func init() {
common.Must(err) common.Must(err)
tempPath := filepath.Join(wd, "..", "..", "testing", "temp") tempPath := filepath.Join(wd, "..", "..", "testing", "temp")
geoipPath := filepath.Join(tempPath, "geoip.dat")
geositePath := filepath.Join(tempPath, "geosite.dat")
os.Setenv("v2ray.location.asset", tempPath) os.Setenv("v2ray.location.asset", tempPath)
geoipPath := platform.GetAssetLocation("geoip.dat") common.Must(os.MkdirAll(tempPath, 0755))
geositePath := platform.GetAssetLocation("geosite.dat")
if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(os.MkdirAll(tempPath, 0755)) if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) {
geoipBytes, err := common.FetchHTTPContent(geoipURL) geoipBytes, err := common.FetchHTTPContent(geoipURL)
common.Must(err) common.Must(err)
common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) common.Must(filesystem.WriteFile(geoipPath, geoipBytes))
}
} }
if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(os.MkdirAll(tempPath, 0755)) if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
geositeBytes, err := common.FetchHTTPContent(geositeURL) if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(err) geositeBytes, err := common.FetchHTTPContent(geositeURL)
common.Must(filesystem.WriteFile(geositePath, geositeBytes)) common.Must(err)
common.Must(filesystem.WriteFile(geositePath, geositeBytes))
}
} }
} }
@ -51,7 +57,7 @@ func TestDecodeGeoIP(t *testing.T) {
} }
expected := []byte{10, 4, 84, 69, 83, 84, 18, 8, 10, 4, 127, 0, 0, 0, 16, 8} expected := []byte{10, 4, 84, 69, 83, 84, 18, 8, 10, 4, 127, 0, 0, 0, 16, 8}
if !bytes.Equal(result, expected) { if cmp.Diff(result, expected) != "" {
t.Errorf("failed to load geoip:test, expected: %v, got: %v", expected, result) t.Errorf("failed to load geoip:test, expected: %v, got: %v", expected, result)
} }
} }
@ -64,7 +70,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} 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 !bytes.Equal(result, expected) { if cmp.Diff(result, expected) != "" {
t.Errorf("failed to load geosite:test, expected: %v, got: %v", expected, result) t.Errorf("failed to load geosite:test, expected: %v, got: %v", expected, result)
} }
} }

31
infra/conf/dns_test.go
View File

@ -23,22 +23,27 @@ func init() {
common.Must(err) common.Must(err)
tempPath := filepath.Join(wd, "..", "..", "testing", "temp") tempPath := filepath.Join(wd, "..", "..", "testing", "temp")
geoipPath := filepath.Join(tempPath, "geoip.dat")
geositePath := filepath.Join(tempPath, "geosite.dat")
os.Setenv("v2ray.location.asset", tempPath) os.Setenv("v2ray.location.asset", tempPath)
geoipPath := platform.GetAssetLocation("geoip.dat") if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
geositePath := platform.GetAssetLocation("geosite.dat") if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(os.MkdirAll(tempPath, 0755))
if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { geoipBytes, err := common.FetchHTTPContent(geoipURL)
common.Must(os.MkdirAll(tempPath, 0755)) common.Must(err)
geoipBytes, err := common.FetchHTTPContent(geoipURL) common.Must(filesystem.WriteFile(geoipPath, geoipBytes))
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)) if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
geositeBytes, err := common.FetchHTTPContent(geositeURL) if _, err := os.Stat(geositePath); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(err) common.Must(os.MkdirAll(tempPath, 0755))
common.Must(filesystem.WriteFile(geositePath, geositeBytes)) geositeBytes, err := common.FetchHTTPContent(geositeURL)
common.Must(err)
common.Must(filesystem.WriteFile(geositePath, geositeBytes))
}
} }
} }

15
infra/conf/router_test.go
View File

@ -24,15 +24,18 @@ func init() {
common.Must(err) common.Must(err)
tempPath := filepath.Join(wd, "..", "..", "testing", "temp") tempPath := filepath.Join(wd, "..", "..", "testing", "temp")
geoipPath := filepath.Join(tempPath, "geoip.dat")
os.Setenv("v2ray.location.asset", tempPath) os.Setenv("v2ray.location.asset", tempPath)
geoipPath := platform.GetAssetLocation("geoip.dat") common.Must(os.MkdirAll(tempPath, 0755))
if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) { if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && errors.Is(err, fs.ErrNotExist) {
common.Must(os.MkdirAll(tempPath, 0755)) if _, err := os.Stat(geoipPath); err != nil && errors.Is(err, fs.ErrNotExist) {
geoipBytes, err := common.FetchHTTPContent(geoipURL) geoipBytes, err := common.FetchHTTPContent(geoipURL)
common.Must(err) common.Must(err)
common.Must(filesystem.WriteFile(geoipPath, geoipBytes)) common.Must(filesystem.WriteFile(geoipPath, geoipBytes))
}
} }
} }