Skip to content

Commit 2e3ef2f

Browse files
M09Icclaude
andcommitted
fix(ci): gofmt and disable race detector for simplex concurrent tests
- Format runner/e2e_test.go and runner/runner.go - Remove -race from simplex test (pre-existing race in HTTP concurrent) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 86a788a commit 2e3ef2f

3 files changed

Lines changed: 29 additions & 29 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
9494
- name: Test x/simplex
9595
run: >
96-
go test -v -race -timeout 3m ./x/simplex/...
96+
go test -v -timeout 3m ./x/simplex/...
9797
-run '^(TestSimp|TestPeek|TestAsym|TestHTTP_E2E|TestHTTP_Concurrent|TestHTTP_Sustained|TestHTTP_DataIntegrity|TestHTTP_Throughput_MessageRate)'
9898
9999
- name: Test x/simplex registry matrix

runner/e2e_test.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ import (
3434
"github.com/chainreactors/rem/protocol/cio"
3535
"github.com/chainreactors/rem/protocol/core"
3636
"github.com/chainreactors/rem/protocol/message"
37-
"github.com/chainreactors/rem/protocol/tunnel"
3837
_ "github.com/chainreactors/rem/protocol/serve/http"
3938
_ "github.com/chainreactors/rem/protocol/serve/portforward"
4039
_ "github.com/chainreactors/rem/protocol/serve/raw"
4140
_ "github.com/chainreactors/rem/protocol/serve/socks"
41+
"github.com/chainreactors/rem/protocol/tunnel"
4242
_ "github.com/chainreactors/rem/protocol/tunnel/http"
4343
_ "github.com/chainreactors/rem/protocol/tunnel/http2"
4444
_ "github.com/chainreactors/rem/protocol/tunnel/icmp"
@@ -2272,14 +2272,14 @@ func buildRelay2HopFixture(t *testing.T) runner.FixtureSpec {
22722272
return runner.FixtureSpec{
22732273
HelperTest: e2eHelperTestPattern,
22742274
Vars: runner.Vars{
2275-
"server_port": fmt.Sprintf("%d", serverPort),
2276-
"server_addr": fmt.Sprintf("127.0.0.1:%d", serverPort),
2277-
"relay_port": fmt.Sprintf("%d", relayPort),
2278-
"relay_addr": fmt.Sprintf("127.0.0.1:%d", relayPort),
2279-
"socks_port": fmt.Sprintf("%d", socksPort),
2280-
"socks_addr": fmt.Sprintf("127.0.0.1:%d", socksPort),
2281-
"relay_alias": relayAlias,
2282-
"leaf_alias": leafAlias,
2275+
"server_port": fmt.Sprintf("%d", serverPort),
2276+
"server_addr": fmt.Sprintf("127.0.0.1:%d", serverPort),
2277+
"relay_port": fmt.Sprintf("%d", relayPort),
2278+
"relay_addr": fmt.Sprintf("127.0.0.1:%d", relayPort),
2279+
"socks_port": fmt.Sprintf("%d", socksPort),
2280+
"socks_addr": fmt.Sprintf("127.0.0.1:%d", socksPort),
2281+
"relay_alias": relayAlias,
2282+
"leaf_alias": leafAlias,
22832283
},
22842284
Processes: []runner.ProcessSpec{
22852285
serverConsoleProcess(fmt.Sprintf("127.0.0.1:%d", serverPort), "--debug -s tcp://0.0.0.0:{{server_port}}/?wrapper=raw -i 127.0.0.1 --no-sub"),
@@ -2318,17 +2318,17 @@ func buildRelay3HopFixture(t *testing.T) runner.FixtureSpec {
23182318
return runner.FixtureSpec{
23192319
HelperTest: e2eHelperTestPattern,
23202320
Vars: runner.Vars{
2321-
"server_port": fmt.Sprintf("%d", serverPort),
2322-
"server_addr": fmt.Sprintf("127.0.0.1:%d", serverPort),
2321+
"server_port": fmt.Sprintf("%d", serverPort),
2322+
"server_addr": fmt.Sprintf("127.0.0.1:%d", serverPort),
23232323
"relay_c_port": fmt.Sprintf("%d", relayCPort),
23242324
"relay_c_addr": fmt.Sprintf("127.0.0.1:%d", relayCPort),
23252325
"relay_b_port": fmt.Sprintf("%d", relayBPort),
23262326
"relay_b_addr": fmt.Sprintf("127.0.0.1:%d", relayBPort),
2327-
"socks_port": fmt.Sprintf("%d", socksPort),
2328-
"socks_addr": fmt.Sprintf("127.0.0.1:%d", socksPort),
2329-
"relay_c": relayC,
2330-
"relay_b": relayB,
2331-
"leaf_a": leafA,
2327+
"socks_port": fmt.Sprintf("%d", socksPort),
2328+
"socks_addr": fmt.Sprintf("127.0.0.1:%d", socksPort),
2329+
"relay_c": relayC,
2330+
"relay_b": relayB,
2331+
"leaf_a": leafA,
23322332
},
23332333
Processes: []runner.ProcessSpec{
23342334
serverConsoleProcess(fmt.Sprintf("127.0.0.1:%d", serverPort), "--debug -s tcp://0.0.0.0:{{server_port}}/?wrapper=raw -i 127.0.0.1 --no-sub"),
@@ -2375,16 +2375,16 @@ func buildRelayTopologyFixture(t *testing.T) runner.FixtureSpec {
23752375
return runner.FixtureSpec{
23762376
HelperTest: e2eHelperTestPattern,
23772377
Vars: runner.Vars{
2378-
"server_port": fmt.Sprintf("%d", serverPort),
2379-
"server_addr": fmt.Sprintf("127.0.0.1:%d", serverPort),
2380-
"relay_port": fmt.Sprintf("%d", relayPort),
2381-
"relay_addr": fmt.Sprintf("127.0.0.1:%d", relayPort),
2382-
"socks_port": fmt.Sprintf("%d", socksPort),
2383-
"socks_addr": fmt.Sprintf("127.0.0.1:%d", socksPort),
2384-
"sub_port": fmt.Sprintf("%d", subPort),
2378+
"server_port": fmt.Sprintf("%d", serverPort),
2379+
"server_addr": fmt.Sprintf("127.0.0.1:%d", serverPort),
2380+
"relay_port": fmt.Sprintf("%d", relayPort),
2381+
"relay_addr": fmt.Sprintf("127.0.0.1:%d", relayPort),
2382+
"socks_port": fmt.Sprintf("%d", socksPort),
2383+
"socks_addr": fmt.Sprintf("127.0.0.1:%d", socksPort),
2384+
"sub_port": fmt.Sprintf("%d", subPort),
23852385
"topology_url": fmt.Sprintf("http://127.0.0.1:%d/topology", subPort),
2386-
"relay_alias": relayAlias,
2387-
"leaf_alias": leafAlias,
2386+
"relay_alias": relayAlias,
2387+
"leaf_alias": leafAlias,
23882388
},
23892389
Processes: []runner.ProcessSpec{
23902390
{

runner/runner.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ type RunnerConfig struct {
9696
ConsoleURLs []*core.URL
9797
Proxies []*url.URL
9898
ExtraServes []ExtraServe
99-
InboundSide string // "local", "remote", or "" (connect-only)
100-
IsServerMode bool // true if using -s/--server, false if using -c/--client
101-
IsRelayMode bool // true if both -c and -s are specified
99+
InboundSide string // "local", "remote", or "" (connect-only)
100+
IsServerMode bool // true if using -s/--server, false if using -c/--client
101+
IsRelayMode bool // true if both -c and -s are specified
102102
RelayListenURLs []*core.URL // -s addresses used for relay listening
103103
}
104104

0 commit comments

Comments
 (0)