diff --git a/testing/scenarios/dokodemo_test.go b/testing/scenarios/dokodemo_test.go index b7e2d738..c5a8e6be 100644 --- a/testing/scenarios/dokodemo_test.go +++ b/testing/scenarios/dokodemo_test.go @@ -7,6 +7,7 @@ import ( "v2ray.com/core/app/log" "v2ray.com/core/app/proxyman" "v2ray.com/core/common/net" + clog "v2ray.com/core/common/net" "v2ray.com/core/common/protocol" "v2ray.com/core/common/serial" "v2ray.com/core/common/uuid" @@ -35,7 +36,7 @@ func TestDokodemoTCP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -68,7 +69,7 @@ func TestDokodemoTCP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, diff --git a/testing/scenarios/feature_test.go b/testing/scenarios/feature_test.go index 7d1b84c0..6c151314 100644 --- a/testing/scenarios/feature_test.go +++ b/testing/scenarios/feature_test.go @@ -12,6 +12,7 @@ import ( "v2ray.com/core/app/log" "v2ray.com/core/app/proxyman" "v2ray.com/core/app/router" + clog "v2ray.com/core/common/log" "v2ray.com/core/common/net" "v2ray.com/core/common/protocol" "v2ray.com/core/common/serial" @@ -718,7 +719,7 @@ func TestDomainSniffing(t *testing.T) { }, }), serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, diff --git a/testing/scenarios/shadowsocks_test.go b/testing/scenarios/shadowsocks_test.go index ae3f611c..931b6402 100644 --- a/testing/scenarios/shadowsocks_test.go +++ b/testing/scenarios/shadowsocks_test.go @@ -11,6 +11,7 @@ import ( "v2ray.com/core/app/log" "v2ray.com/core/app/proxyman" "v2ray.com/core/common/buf" + clog "v2ray.com/core/common/log" "v2ray.com/core/common/net" "v2ray.com/core/common/protocol" "v2ray.com/core/common/serial" @@ -44,7 +45,7 @@ func TestShadowsocksAES256TCP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -73,7 +74,7 @@ func TestShadowsocksAES256TCP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -162,7 +163,7 @@ func TestShadowsocksAES128UDP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -192,7 +193,7 @@ func TestShadowsocksAES128UDP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -281,7 +282,7 @@ func TestShadowsocksChacha20TCP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -310,7 +311,7 @@ func TestShadowsocksChacha20TCP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -398,7 +399,7 @@ func TestShadowsocksAES256GCMTCP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -427,7 +428,7 @@ func TestShadowsocksAES256GCMTCP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -515,7 +516,7 @@ func TestShadowsocksAES128GCMUDP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -545,7 +546,7 @@ func TestShadowsocksAES128GCMUDP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -633,7 +634,7 @@ func TestShadowsocksAES256GCMConformance(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -711,7 +712,7 @@ func TestShadowsocksChacha20Poly1305UDPConformance(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -794,7 +795,7 @@ func TestShadowsocksChacha20Conformance(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, diff --git a/testing/scenarios/vmess_test.go b/testing/scenarios/vmess_test.go index 4d6984e6..9b494fb9 100644 --- a/testing/scenarios/vmess_test.go +++ b/testing/scenarios/vmess_test.go @@ -9,6 +9,7 @@ import ( "v2ray.com/core" "v2ray.com/core/app/log" "v2ray.com/core/app/proxyman" + clog "v2ray.com/core/common/log" "v2ray.com/core/common/net" "v2ray.com/core/common/protocol" "v2ray.com/core/common/serial" @@ -39,7 +40,7 @@ func TestVMessDynamicPort(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -94,7 +95,7 @@ func TestVMessDynamicPort(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -174,7 +175,7 @@ func TestVMessGCM(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -207,7 +208,7 @@ func TestVMessGCM(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -297,7 +298,7 @@ func TestVMessGCMUDP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -330,7 +331,7 @@ func TestVMessGCMUDP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -430,7 +431,7 @@ func TestVMessChacha20(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -463,7 +464,7 @@ func TestVMessChacha20(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -553,7 +554,7 @@ func TestVMessNone(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -586,7 +587,7 @@ func TestVMessNone(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -678,7 +679,7 @@ func TestVMessKCP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -714,7 +715,7 @@ func TestVMessKCP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -811,7 +812,7 @@ func TestVMessIPv6(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -844,7 +845,7 @@ func TestVMessIPv6(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -926,7 +927,7 @@ func TestVMessGCMMux(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -959,7 +960,7 @@ func TestVMessGCMMux(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -1068,7 +1069,7 @@ func TestVMessGCMMuxUDP(t *testing.T) { serverConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), }, @@ -1102,7 +1103,7 @@ func TestVMessGCMMuxUDP(t *testing.T) { clientConfig := &core.Config{ App: []*serial.TypedMessage{ serial.ToTypedMessage(&log.Config{ - ErrorLogLevel: log.LogLevel_Debug, + ErrorLogLevel: clog.Severity_Debug, ErrorLogType: log.LogType_Console, }), },