Skip to content

fix: isolate updater service test files #1644

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

Open
immanuwell wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −20
Open

fix: isolate updater service test files #1644

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
32 changes: 12 additions & 20 deletions cmd/cloudflared/updater/workers_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (
"github.com/stretchr/testify/require"
)

var testFilePath = filepath.Join(os.TempDir(), "test")

func respondWithJSON(w http.ResponseWriter, v interface{}, status int) {
data, _ := json.Marshal(v)

Expand Down Expand Up @@ -201,19 +199,20 @@ func createServer() *httptest.Server {
return httptest.NewServer(mux)
}

func createTestFile(t *testing.T, path string) {
func createTestFile(t *testing.T) string {
path := filepath.Join(t.TempDir(), "cloudflared")
f, err := os.Create(path)
require.NoError(t, err)
fmt.Fprint(f, "2020.08.04")
f.Close()
require.NoError(t, f.Close())
return path
}

func TestUpdateService(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)
log.Println("server url: ", ts.URL)

s := NewWorkersService("2020.8.2", fmt.Sprintf("%s/updater", ts.URL), testFilePath, Options{})
Expand All @@ -232,8 +231,7 @@ func TestBetaUpdateService(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)

s := NewWorkersService("2020.8.2", fmt.Sprintf("%s/updater", ts.URL), testFilePath, Options{IsBeta: true})
v, err := s.Check()
Expand All @@ -251,8 +249,7 @@ func TestFailUpdateService(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)

s := NewWorkersService("2020.8.2", fmt.Sprintf("%s/fail", ts.URL), testFilePath, Options{})
v, err := s.Check()
Expand All @@ -264,8 +261,7 @@ func TestNoUpdateService(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)

s := NewWorkersService(mostRecentVersion, fmt.Sprintf("%s/updater", ts.URL), testFilePath, Options{})
v, err := s.Check()
Expand All @@ -278,8 +274,7 @@ func TestForcedUpdateService(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)

s := NewWorkersService("2020.8.5", fmt.Sprintf("%s/updater", ts.URL), testFilePath, Options{IsForced: true})
v, err := s.Check()
Expand All @@ -297,8 +292,7 @@ func TestUpdateSpecificVersionService(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)
reqVersion := "2020.9.1"

s := NewWorkersService("2020.8.2", fmt.Sprintf("%s/updater", ts.URL), testFilePath, Options{RequestedVersion: reqVersion})
Expand All @@ -317,8 +311,7 @@ func TestCompressedUpdateService(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)

s := NewWorkersService("2020.8.2", fmt.Sprintf("%s/compressed", ts.URL), testFilePath, Options{})
v, err := s.Check()
Expand All @@ -336,8 +329,7 @@ func TestUpdateWhenRunningKnownBuggyVersion(t *testing.T) {
ts := createServer()
defer ts.Close()

createTestFile(t, testFilePath)
defer os.Remove(testFilePath)
testFilePath := createTestFile(t)

s := NewWorkersService(knownBuggyVersion, fmt.Sprintf("%s/updater", ts.URL), testFilePath, Options{})
v, err := s.Check()
Expand Down