⚡ Fix tests (#10)

* ⚡ Fix config test * ⚡️ Fix VMess outbound test * 🔧 Workaround: Disable IV check for tests * 🔧 Fix source path * 🔧 Workaround: Disable IV check for unencrypted shadowsocks * 🪔 Codecov wants higher fetch depth * ☂ Remove codecov Co-authored-by: database64128 <[email protected]>
Shadowsocks-NET · Sep 4, 2021 · 19ce248 · 19ce248
1 parent 325656b
commit 19ce248
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -45,6 +45,3 @@ jobs:
           export PATH=$(go env GOPATH)/bin:${PATH}
           go install -v github.com/ory/go-acc@latest
           go-acc --covermode=atomic -o=coverage.txt ./...
-
-      - name: Upload codecov
-        run: bash <(curl -s https://codecov.io/bash)
diff --git a/infra/conf/v2ray_test.go b/infra/conf/v2ray_test.go
@@ -43,16 +43,12 @@ func TestV2RayConfig(t *testing.T) {
 	runMultiTestCase(t, []TestCase{
 		{
 			Input: `{
-				"outbound": {
-					"protocol": "freedom",
-					"settings": {}
-				},
 				"log": {
 					"access": "/var/log/v2ray/access.log",
 					"loglevel": "error",
 					"error": "/var/log/v2ray/error.log"
 				},
-				"inbound": {
+				"inbounds": [{
 					"streamSettings": {
 						"network": "ws",
 						"wsSettings": {
@@ -77,7 +73,7 @@ func TestV2RayConfig(t *testing.T) {
 						]
 					}
 				},
-				"inbounds": [{
+				{
 					"streamSettings": {
 						"network": "ws",
 						"wsSettings": {
@@ -106,7 +102,11 @@ func TestV2RayConfig(t *testing.T) {
 						]
 					}
 				}],
-				"outboundDetour": [
+				"outbounds": [
+					{
+						"protocol": "freedom",
+						"settings": {}
+					},
 					{
 						"tag": "blocked",
 						"protocol": "blackhole"

diff --git a/infra/conf/vmess_test.go b/infra/conf/vmess_test.go
@@ -20,17 +20,15 @@ func TestVMessOutbound(t *testing.T) {
 	runMultiTestCase(t, []TestCase{
 		{
 			Input: `{
-				"vnext": [{
-					"address": "127.0.0.1",
-					"port": 80,
-					"users": [
-						{
-							"id": "e641f5ad-9397-41e3-bf1a-e8740dfed019",
-							"email": "[email protected]",
-							"level": 255
-						}
-					]
-				}]
+				"address": "127.0.0.1",
+				"port": 80,
+				"users": [
+					{
+						"id": "e641f5ad-9397-41e3-bf1a-e8740dfed019",
+						"email": "[email protected]",
+						"level": 255
+					}
+				]
 			}`,
 			Parser: loadJSON(creator),
 			Output: &outbound.Config{

diff --git a/proxy/shadowsocks/protocol_test.go b/proxy/shadowsocks/protocol_test.go
@@ -69,8 +69,9 @@ func TestTCPRequest(t *testing.T) {
 				User: &protocol.MemoryUser{
 					Email: "[email protected]",
 					Account: toAccount(&Account{
-						Password:   "tcp-password",
-						CipherType: CipherType_AES_128_GCM,
+						Password:       "tcp-password",
+						CipherType:     CipherType_AES_128_GCM,
+						DisableIvCheck: true,
 					}),
 				},
 			},
@@ -85,8 +86,9 @@ func TestTCPRequest(t *testing.T) {
 				User: &protocol.MemoryUser{
 					Email: "[email protected]",
 					Account: toAccount(&Account{
-						Password:   "password",
-						CipherType: CipherType_AES_256_GCM,
+						Password:       "password",
+						CipherType:     CipherType_AES_256_GCM,
+						DisableIvCheck: true,
 					}),
 				},
 			},
@@ -101,8 +103,9 @@ func TestTCPRequest(t *testing.T) {
 				User: &protocol.MemoryUser{
 					Email: "[email protected]",
 					Account: toAccount(&Account{
-						Password:   "password",
-						CipherType: CipherType_CHACHA20_POLY1305,
+						Password:       "password",
+						CipherType:     CipherType_CHACHA20_POLY1305,
+						DisableIvCheck: true,
 					}),
 				},
 			},

diff --git a/testing/scenarios/common.go b/testing/scenarios/common.go
@@ -118,7 +118,7 @@ func genTestBinaryPath() {
 }
 
 func GetSourcePath() string {
-	return filepath.Join("github.com", "v2fly", "v2ray-core", "v4", "main")
+	return filepath.Join("github.com", "Shadowsocks-NET", "v2ray-go", "v4", "main")
 }
 
 func CloseAllServers(servers []*exec.Cmd) {

diff --git a/testing/scenarios/shadowsocks_test.go b/testing/scenarios/shadowsocks_test.go
@@ -409,8 +409,9 @@ func TestShadowsocksNone(t *testing.T) {
 	defer tcpServer.Close()
 
 	account := serial.ToTypedMessage(&shadowsocks.Account{
-		Password:   "shadowsocks-password",
-		CipherType: shadowsocks.CipherType_NONE,
+		Password:       "shadowsocks-password",
+		CipherType:     shadowsocks.CipherType_NONE,
+		DisableIvCheck: true,
 	})
 
 	serverPort := tcp.PickPort()