1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
From: Daniel Swarbrick <dswarbrick@debian.org>
Date: Thu, 5 Jan 2023 12:33:54 +1300
Subject: Fallback to IPv4 name resolution in gRPC tests
Bug: https://github.com/prometheus/blackbox_exporter/issues/969
Last-Update: 2023-01-05
This conforms to other tests in this repo. It should also address the issue
of tests failing on reproducible builds, where localhost apparently does not
resolve to ::1 in addition to 127.0.0.1.
---
prober/grpc_test.go | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/prober/grpc_test.go b/prober/grpc_test.go
index 2a2c4ae..be37adf 100644
--- a/prober/grpc_test.go
+++ b/prober/grpc_test.go
@@ -68,7 +68,7 @@ func TestGRPCConnection(t *testing.T) {
result := ProbeGRPC(testCTX, "localhost:"+port,
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
},
}, registry, promslog.NewNopLogger())
@@ -137,7 +137,7 @@ func TestMultipleGRPCservices(t *testing.T) {
resultService1 := ProbeGRPC(testCTX, "localhost:"+port,
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
Service: "service1",
},
}, registryService1, promslog.NewNopLogger())
@@ -149,7 +149,7 @@ func TestMultipleGRPCservices(t *testing.T) {
registryService2 := prometheus.NewRegistry()
resultService2 := ProbeGRPC(testCTX, "localhost:"+port,
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
Service: "service2",
},
}, registryService2, promslog.NewNopLogger())
@@ -161,7 +161,7 @@ func TestMultipleGRPCservices(t *testing.T) {
registryService3 := prometheus.NewRegistry()
resultService3 := ProbeGRPC(testCTX, "localhost:"+port,
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
Service: "service3",
},
}, registryService3, promslog.NewNopLogger())
@@ -238,7 +238,7 @@ func TestGRPCTLSConnection(t *testing.T) {
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
TLS: true,
TLSConfig: pconfig.TLSConfig{InsecureSkipVerify: true},
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
},
}, registry, promslog.NewNopLogger())
@@ -302,7 +302,7 @@ func TestNoTLSConnection(t *testing.T) {
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
TLS: true,
TLSConfig: pconfig.TLSConfig{InsecureSkipVerify: true},
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
},
}, registry, promslog.NewNopLogger())
@@ -358,7 +358,7 @@ func TestGRPCServiceNotFound(t *testing.T) {
result := ProbeGRPC(testCTX, "localhost:"+port,
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
Service: "NonExistingService",
},
}, registry, promslog.NewNopLogger())
@@ -411,7 +411,7 @@ func TestGRPCHealthCheckUnimplemented(t *testing.T) {
result := ProbeGRPC(testCTX, "localhost:"+port,
config.Module{Timeout: time.Second, GRPC: config.GRPCProbe{
- IPProtocolFallback: false,
+ IPProtocolFallback: true,
Service: "NonExistingService",
},
}, registry, promslog.NewNopLogger())
|
