Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

common/testutil: Exclude port ranges for both TCP and UDP #10872

Merged
merged 1 commit into from
Jun 9, 2022
Merged

common/testutil: Exclude port ranges for both TCP and UDP #10872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions internal/common/testutil/testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,16 @@ func GetAvailablePort(t *testing.T) uint16 {

// Get excluded ports on Windows from the command: netsh interface ipv4 show excludedportrange protocol=tcp
func getExclusionsList(t *testing.T) []portpair {
cmd := exec.Command("netsh", "interface", "ipv4", "show", "excludedportrange", "protocol=tcp")
output, err := cmd.CombinedOutput()
require.NoError(t, err)
cmdTCP := exec.Command("netsh", "interface", "ipv4", "show", "excludedportrange", "protocol=tcp")
outputTCP, errTCP := cmdTCP.CombinedOutput()
require.NoError(t, errTCP)
exclusions := createExclusionsList(string(outputTCP), t)

cmdUDP := exec.Command("netsh", "interface", "ipv4", "show", "excludedportrange", "protocol=udp")
outputUDP, errUDP := cmdUDP.CombinedOutput()
require.NoError(t, errUDP)
exclusions = append(exclusions, createExclusionsList(string(outputUDP), t)...)

exclusions := createExclusionsList(string(output), t)
return exclusions
}

Expand Down
7 changes: 0 additions & 7 deletions receiver/jaegerreceiver/jaeger_agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,7 @@ import (

var jaegerAgent = config.NewComponentIDWithName(typeStr, "agent_test")

var skip = func(t *testing.T, why string) {
t.Skip(why)
}

func TestJaegerAgentUDP_ThriftCompact(t *testing.T) {
skip(t, "Flaky Test - See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/10368")
port := testutil.GetAvailablePort(t)
addrForClient := fmt.Sprintf(":%d", port)
testJaegerAgent(t, addrForClient, &configuration{
Expand All @@ -76,7 +71,6 @@ func TestJaegerAgentUDP_ThriftCompact_InvalidPort(t *testing.T) {
}

func TestJaegerAgentUDP_ThriftBinary(t *testing.T) {
skip(t, "Flaky Test - See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/10369")
port := testutil.GetAvailablePort(t)
addrForClient := fmt.Sprintf(":%d", port)
testJaegerAgent(t, addrForClient, &configuration{
Expand All @@ -86,7 +80,6 @@ func TestJaegerAgentUDP_ThriftBinary(t *testing.T) {
}

func TestJaegerAgentUDP_ThriftBinary_PortInUse(t *testing.T) {
skip(t, "Flaky Test - See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/10370")
// This test confirms that the thrift binary port is opened correctly. This is all we can test at the moment. See above.
port := testutil.GetAvailablePort(t)

Expand Down
4 changes: 0 additions & 4 deletions receiver/statsdreceiver/receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"context"
"errors"
"net"
"runtime"
"strconv"
"testing"
"time"
Expand Down Expand Up @@ -94,9 +93,6 @@ func TestStatsdReceiver_Flush(t *testing.T) {
}

func Test_statsdreceiver_EndToEnd(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("skipping test on windows, see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/10151")
}
addr := testutil.GetAvailableLocalAddress(t)
host, portStr, err := net.SplitHostPort(addr)
require.NoError(t, err)
Expand Down