Revert "Fixed integration tests"

This reverts commit 67953bfe2f54c4231e95d77987eb8f39e3f3fc46.
This commit is contained in:
Alessandro (Ale) Segala 2021-11-09 16:24:10 +00:00 committed by GitHub
parent 3b34c7b89a
commit c290ce4b91

View File

@ -254,7 +254,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
fmt.Sprintf("%s/integration_test/etc:/etc/headscale", currentPath), fmt.Sprintf("%s/integration_test/etc:/etc/headscale", currentPath),
}, },
Networks: []*dockertest.Network{&network}, Networks: []*dockertest.Network{&network},
Cmd: []string{"/headscale", "serve"}, Cmd: []string{"headscale", "serve"},
} }
fmt.Println("Creating headscale container") fmt.Println("Creating headscale container")
@ -301,7 +301,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
fmt.Printf("Creating headscale namespace: %s\n", namespace) fmt.Printf("Creating headscale namespace: %s\n", namespace)
result, err := executeCommand( result, err := executeCommand(
&headscale, &headscale,
[]string{"/headscale", "namespaces", "create", namespace}, []string{"headscale", "namespaces", "create", namespace},
[]string{}, []string{},
) )
fmt.Println("headscale create namespace result: ", result) fmt.Println("headscale create namespace result: ", result)
@ -311,7 +311,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
authKey, err := executeCommand( authKey, err := executeCommand(
&headscale, &headscale,
[]string{ []string{
"/headscale", "headscale",
"--namespace", "--namespace",
namespace, namespace,
"preauthkeys", "preauthkeys",
@ -369,7 +369,7 @@ func (s *IntegrationTestSuite) TestListNodes() {
fmt.Println("Listing nodes") fmt.Println("Listing nodes")
result, err := executeCommand( result, err := executeCommand(
&headscale, &headscale,
[]string{"/headscale", "--namespace", namespace, "nodes", "list"}, []string{"headscale", "--namespace", namespace, "nodes", "list"},
[]string{}, []string{},
) )
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
@ -502,7 +502,7 @@ func (s *IntegrationTestSuite) TestSharedNodes() {
result, err := executeCommand( result, err := executeCommand(
&headscale, &headscale,
[]string{"/headscale", "nodes", "list", "-o", "json", "--namespace", "shared"}, []string{"headscale", "nodes", "list", "-o", "json", "--namespace", "shared"},
[]string{}, []string{},
) )
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
@ -515,7 +515,7 @@ func (s *IntegrationTestSuite) TestSharedNodes() {
result, err := executeCommand( result, err := executeCommand(
&headscale, &headscale,
[]string{"/headscale", "nodes", "share", "--identifier", fmt.Sprint(machine.ID), "--namespace", "main"}, []string{"headscale", "nodes", "share", "--identifier", fmt.Sprint(machine.ID), "--namespace", "main"},
[]string{}, []string{},
) )
assert.Nil(s.T(), err) assert.Nil(s.T(), err)
@ -525,7 +525,7 @@ func (s *IntegrationTestSuite) TestSharedNodes() {
result, err = executeCommand( result, err = executeCommand(
&headscale, &headscale,
[]string{"/headscale", "nodes", "list", "--namespace", "main"}, []string{"headscale", "nodes", "list", "--namespace", "main"},
[]string{}, []string{},
) )
assert.Nil(s.T(), err) assert.Nil(s.T(), err)