Skip to content

Commit c3930a7

Browse files
committed
tests: update timeout for msi builds
1 parent a66ba04 commit c3930a7

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,13 @@ fmt: tools
244244
set -e; for CMD in $(CMDS); do \
245245
$(GOVET) ./cmd/$$CMD; \
246246
done
247-
set -e; for dir in $(shell ls -d1 pkg/*); do \
247+
set -e; for dir in $(shell ls -d1 pkg/* t/); do \
248248
$(GOVET) ./$$dir; \
249249
done
250-
gofmt -w -s ./cmd/ ./pkg/
251-
./tools/gofumpt -w ./cmd/ ./pkg/
252-
./tools/gci write ./cmd/. ./pkg/. --skip-generated
253-
goimports -w ./cmd/ ./pkg/
250+
gofmt -w -s ./cmd/ ./pkg/ ./t/
251+
./tools/gofumpt -w ./cmd/ ./pkg/ ./t/
252+
./tools/gci write ./cmd/. ./pkg/. ./t/. --skip-generated
253+
goimports -w ./cmd/ ./pkg/ ./t/.
254254

255255
versioncheck:
256256
@[ $$( printf '%s\n' $(GOVERSION) $(MINGOVERSION) | sort | head -n 1 ) = $(MINGOVERSION) ] || { \

t/40_build_msi_windows_test.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@ package main
33
import (
44
"os"
55
"testing"
6+
"time"
67

78
"github.com/stretchr/testify/assert"
89
"github.com/stretchr/testify/require"
910
)
1011

11-
var localINIPath = `C:\Program Files\snclient\snclient_local.ini`
12+
const (
13+
localINIPath = `C:\Program Files\snclient\snclient_local.ini`
14+
15+
buildMSITimeout = 3 * time.Minute
16+
)
1217

1318
var requiredFiles = []string{
1419
"snclient.exe",
@@ -74,7 +79,8 @@ func TestMSIinstaller(t *testing.T) {
7479
"-rev", "101",
7580
"-sha", "deadbeef",
7681
},
77-
Like: []string{"Windows Installer", "snclient.wxs"},
82+
Like: []string{"Windows Installer", "snclient.wxs"},
83+
Timeout: buildMSITimeout,
7884
})
7985

8086
// install update from msi file

0 commit comments

Comments
 (0)