Merge pull request #161 from felixonmars/fix-test

Fix dns tests by setting v2ray.location.asset
v2fly · Sep 3, 2020 · d2226cb · d2226cb
2 parents 39e9916 + 11bf22b
commit d2226cb
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/infra/conf/dns_test.go b/infra/conf/dns_test.go
@@ -20,11 +20,12 @@ func init() {
 	wd, err := os.Getwd()
 	common.Must(err)
 
-	if _, err := os.Stat(platform.GetAssetLocation("geosite.dat")); err != nil && os.IsNotExist(err) {
-		common.Must(filesystem.CopyFile(platform.GetAssetLocation("geosite.dat"), filepath.Join(wd, "..", "..", "release", "config", "geosite.dat")))
+	if _, err := os.Stat(platform.GetAssetLocation("geoip.dat")); err != nil && os.IsNotExist(err) {
+		common.Must(filesystem.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(wd, "..", "..", "release", "config", "geoip.dat")))
 	}
 
-	geositeFilePath := platform.GetAssetLocation("geosite.dat")
+	geositeFilePath := filepath.Join(wd, "geosite.dat")
+	os.Setenv("v2ray.location.asset", wd)
 	geositeFile, err := os.OpenFile(geositeFilePath, os.O_CREATE|os.O_WRONLY, 0600)
 	common.Must(err)
 	defer geositeFile.Close()
@@ -48,6 +49,7 @@ func TestDnsConfigParsing(t *testing.T) {
 	geositePath := platform.GetAssetLocation("geosite.dat")
 	defer func() {
 		os.Remove(geositePath)
+		os.Unsetenv("v2ray.location.asset")
 	}()
 
 	parserCreator := func() func(string) (proto.Message, error) {