myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Formatting of integration tests

Browse source
This commit is contained in:
Kristoffer Dalby 2022-01-25 22:11:15 +00:00
parent e8e573de62
commit 8218ef96ef
2 changed files with 63 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
integration_common_test.go
View file

@ -8,16 +8,17 @@ import (
"fmt" "fmt"
"time" "time"
"inet.af/netaddr"
"github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker" "github.com/ory/dockertest/v3/docker"
"inet.af/netaddr"
) )
const DOCKER_EXECUTE_TIMEOUT = 10 * time.Second const DOCKER_EXECUTE_TIMEOUT = 10 * time.Second
var IpPrefix4 = netaddr.MustParseIPPrefix("100.64.0.0/10") var (
var IpPrefix6 = netaddr.MustParseIPPrefix("fd7a:115c:a1e0::/48") IpPrefix4 = netaddr.MustParseIPPrefix("100.64.0.0/10")
IpPrefix6 = netaddr.MustParseIPPrefix("fd7a:115c:a1e0::/48")
)
type ExecuteCommandConfig struct { type ExecuteCommandConfig struct {
timeout time.Duration timeout time.Duration

16
integration_test.go
View file

@ -375,7 +375,7 @@ func (s *IntegrationTestSuite) TestGetIpAddresses() {
ips, err := getIPs(scales.tailscales) ips, err := getIPs(scales.tailscales)
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
for hostname, _ := range scales.tailscales { for hostname := range scales.tailscales {
ips := ips[hostname] ips := ips[hostname]
for _, ip := range ips { for _, ip := range ips {
s.T().Run(hostname, func(t *testing.T) { s.T().Run(hostname, func(t *testing.T) {
@ -464,7 +464,8 @@ func (s *IntegrationTestSuite) TestPingAllPeersByAddress() {
if peername == hostname { if peername == hostname {
continue continue
} }
s.T().Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) { s.T().
Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) {
// We are only interested in "direct ping" which means what we // We are only interested in "direct ping" which means what we
// might need a couple of more attempts before reaching the node. // might need a couple of more attempts before reaching the node.
command := []string{ command := []string{
@ -569,7 +570,8 @@ func (s *IntegrationTestSuite) TestSharedNodes() {
if peername == hostname { if peername == hostname {
continue continue
} }
s.T().Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) { s.T().
Run(fmt.Sprintf("%s-%s-%d", hostname, peername, i), func(t *testing.T) {
// We are only interested in "direct ping" which means what we // We are only interested in "direct ping" which means what we
// might need a couple of more attempts before reaching the node. // might need a couple of more attempts before reaching the node.
command := []string{ command := []string{
@ -625,7 +627,7 @@ func (s *IntegrationTestSuite) TestTailDrop() {
[]string{}, []string{},
) )
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
for peername, _ := range ips { for peername := range ips {
if peername == hostname { if peername == hostname {
continue continue
} }
@ -705,7 +707,7 @@ func (s *IntegrationTestSuite) TestPingAllPeersByHostname() {
ips, err := getIPs(scales.tailscales) ips, err := getIPs(scales.tailscales)
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
for hostname, tailscale := range scales.tailscales { for hostname, tailscale := range scales.tailscales {
for peername, _ := range ips { for peername := range ips {
if peername == hostname { if peername == hostname {
continue continue
} }
@ -774,7 +776,9 @@ func (s *IntegrationTestSuite) TestMagicDNS() {
} }
} }
func getIPs(tailscales map[string]dockertest.Resource) (map[string][]netaddr.IP, error) { func getIPs(
tailscales map[string]dockertest.Resource,
) (map[string][]netaddr.IP, error) {
ips := make(map[string][]netaddr.IP) ips := make(map[string][]netaddr.IP)
for hostname, tailscale := range tailscales { for hostname, tailscale := range tailscales {
command := []string{"tailscale", "ip"} command := []string{"tailscale", "ip"}