Skip to content

Commit 1b8e903

Browse files
sbruenssbruens
committed
Fix tests.
1 parent 26b9100 commit 1b8e903

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

‎cmd/outline-ss-server/metrics_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ func BenchmarkProbe(b *testing.B) {
164164
ssMetrics := newPrometheusOutlineMetrics(nil, prometheus.NewRegistry())
165165
status := "ERR_REPLAY"
166166
drainResult := "other"
167-
port := 12345
168167
data := metrics.ProxyMetrics{}
169168
b.ResetTimer()
170169
for i := 0; i < b.N; i++ {

‎internal/integration_test/integration_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func TestTCPEcho(t *testing.T) {
133133
const testTimeout = 200 * time.Millisecond
134134
testMetrics := &service.NoOpTCPMetrics{}
135135
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
136-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
136+
handler := service.NewTCPHandler(proxyListener.Addr().String(), authFunc, testMetrics, testTimeout)
137137
handler.SetTargetDialer(&transport.TCPDialer{})
138138
done := make(chan struct{})
139139
go func() {
@@ -202,7 +202,7 @@ func TestRestrictedAddresses(t *testing.T) {
202202
const testTimeout = 200 * time.Millisecond
203203
testMetrics := &statusMetrics{}
204204
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
205-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
205+
handler := service.NewTCPHandler(proxyListener.Addr().String(), authFunc, testMetrics, testTimeout)
206206
done := make(chan struct{})
207207
go func() {
208208
service.StreamServe(service.WrapStreamListener(proxyListener.AcceptTCP), handler.Handle)
@@ -384,7 +384,7 @@ func BenchmarkTCPThroughput(b *testing.B) {
384384
const testTimeout = 200 * time.Millisecond
385385
testMetrics := &service.NoOpTCPMetrics{}
386386
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
387-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
387+
handler := service.NewTCPHandler(proxyListener.Addr().String(), authFunc, testMetrics, testTimeout)
388388
handler.SetTargetDialer(&transport.TCPDialer{})
389389
done := make(chan struct{})
390390
go func() {
@@ -448,7 +448,7 @@ func BenchmarkTCPMultiplexing(b *testing.B) {
448448
const testTimeout = 200 * time.Millisecond
449449
testMetrics := &service.NoOpTCPMetrics{}
450450
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
451-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
451+
handler := service.NewTCPHandler(proxyListener.Addr().String(), authFunc, testMetrics, testTimeout)
452452
handler.SetTargetDialer(&transport.TCPDialer{})
453453
done := make(chan struct{})
454454
go func() {

‎service/tcp_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ func TestProbeRandom(t *testing.T) {
281281
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
282282
testMetrics := &probeTestMetrics{}
283283
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
284-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
284+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, 200*time.Millisecond)
285285
done := make(chan struct{})
286286
go func() {
287287
StreamServe(WrapStreamListener(listener.AcceptTCP), handler.Handle)
@@ -358,7 +358,7 @@ func TestProbeClientBytesBasicTruncated(t *testing.T) {
358358
cipher := firstCipher(cipherList)
359359
testMetrics := &probeTestMetrics{}
360360
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
361-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
361+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, 200*time.Millisecond)
362362
handler.SetTargetDialer(makeValidatingTCPStreamDialer(allowAll))
363363
done := make(chan struct{})
364364
go func() {
@@ -393,7 +393,7 @@ func TestProbeClientBytesBasicModified(t *testing.T) {
393393
cipher := firstCipher(cipherList)
394394
testMetrics := &probeTestMetrics{}
395395
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
396-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
396+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, 200*time.Millisecond)
397397
handler.SetTargetDialer(makeValidatingTCPStreamDialer(allowAll))
398398
done := make(chan struct{})
399399
go func() {
@@ -429,7 +429,7 @@ func TestProbeClientBytesCoalescedModified(t *testing.T) {
429429
cipher := firstCipher(cipherList)
430430
testMetrics := &probeTestMetrics{}
431431
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
432-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
432+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, 200*time.Millisecond)
433433
handler.SetTargetDialer(makeValidatingTCPStreamDialer(allowAll))
434434
done := make(chan struct{})
435435
go func() {
@@ -472,7 +472,7 @@ func TestProbeServerBytesModified(t *testing.T) {
472472
cipher := firstCipher(cipherList)
473473
testMetrics := &probeTestMetrics{}
474474
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
475-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
475+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, 200*time.Millisecond)
476476
done := make(chan struct{})
477477
go func() {
478478
StreamServe(WrapStreamListener(listener.AcceptTCP), handler.Handle)
@@ -503,7 +503,7 @@ func TestReplayDefense(t *testing.T) {
503503
testMetrics := &probeTestMetrics{}
504504
const testTimeout = 200 * time.Millisecond
505505
authFunc := NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
506-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
506+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, testTimeout)
507507
snapshot := cipherList.SnapshotForClientIP(netip.Addr{})
508508
cipherEntry := snapshot[0].Value.(*CipherEntry)
509509
cipher := cipherEntry.CryptoKey
@@ -582,7 +582,7 @@ func TestReverseReplayDefense(t *testing.T) {
582582
testMetrics := &probeTestMetrics{}
583583
const testTimeout = 200 * time.Millisecond
584584
authFunc := NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
585-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
585+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, testTimeout)
586586
snapshot := cipherList.SnapshotForClientIP(netip.Addr{})
587587
cipherEntry := snapshot[0].Value.(*CipherEntry)
588588
cipher := cipherEntry.CryptoKey
@@ -653,7 +653,7 @@ func probeExpectTimeout(t *testing.T, payloadSize int) {
653653
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
654654
testMetrics := &probeTestMetrics{}
655655
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
656-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
656+
handler := NewTCPHandler(listener.Addr().String(), authFunc, testMetrics, testTimeout)
657657

658658
done := make(chan struct{})
659659
go func() {

0 commit comments

Comments
 (0)