From 3777de7133ebf0cb55c6c1820df264a60544e403 Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kradalby@kradalby.no>
Date: Mon, 27 Jun 2022 12:00:21 +0000
Subject: [PATCH] Use failnow for cli tests aswell
---
integration_cli_test.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/integration_cli_test.go b/integration_cli_test.go
index 8ac6ee4..11daae9 100644
--- a/integration_cli_test.go
+++ b/integration_cli_test.go
@@ -40,13 +40,13 @@ func (s *IntegrationCLITestSuite) SetupTest() {
if ppool, err := dockertest.NewPool(""); err == nil {
s.pool = *ppool
} else {
- log.Fatalf("Could not connect to docker: %s", err)
+ s.FailNow(fmt.Sprintf("Could not connect to docker: %s", err), "")
}
if pnetwork, err := s.pool.CreateNetwork("headscale-test"); err == nil {
s.network = *pnetwork
} else {
- log.Fatalf("Could not create network: %s", err)
+ s.FailNow(fmt.Sprintf("Could not create network: %s", err), "")
}
headscaleBuildOptions := &dockertest.BuildOptions{
@@ -56,7 +56,7 @@ func (s *IntegrationCLITestSuite) SetupTest() {
currentPath, err := os.Getwd()
if err != nil {
- log.Fatalf("Could not determine current path: %s", err)
+ s.FailNow(fmt.Sprintf("Could not determine current path: %s", err), "")
}
headscaleOptions := &dockertest.RunOptions{
@@ -72,7 +72,7 @@ func (s *IntegrationCLITestSuite) SetupTest() {
if pheadscale, err := s.pool.BuildAndRunWithBuildOptions(headscaleBuildOptions, headscaleOptions, DockerRestartPolicy); err == nil {
s.headscale = *pheadscale
} else {
- log.Fatalf("Could not start headscale container: %s", err)
+ s.FailNow(fmt.Sprintf("Could not start headscale container: %s", err), "")
}
fmt.Println("Created headscale container")