testsuite/ui: move go.mod
I would like to start moving some of the integration tests from scripts folder into testsuite. This allows integration tests to easily have other and fewer dependencies. This will also be useful for https://github.com/storj/storj/issues/4823. Change-Id: Idbdb5aefc0e42d091ad7f74dbdc096281c1dfcba
This commit is contained in:
parent
f626cd1868
commit
94ae196189
@ -31,7 +31,7 @@ pipeline {
|
||||
|
||||
// download dependencies
|
||||
sh 'go mod download'
|
||||
sh 'cd testsuite && go mod download'
|
||||
sh 'cd testsuite/ui && go mod download'
|
||||
|
||||
// pre-check that we cannot do at a later stage reliably
|
||||
sh 'check-large-files'
|
||||
@ -143,7 +143,7 @@ pipeline {
|
||||
|
||||
sh 'protolock status'
|
||||
|
||||
dir("testsuite") {
|
||||
dir("testsuite/ui") {
|
||||
sh 'check-imports ./...'
|
||||
sh 'check-atomic-align ./...'
|
||||
sh 'check-monkit ./...'
|
||||
@ -386,7 +386,7 @@ pipeline {
|
||||
steps {
|
||||
sh 'psql -U postgres -c \'create database testui;\''
|
||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||
sh 'cd testsuite && go test -parallel 1 -p 1 -short -vet=off -timeout 5m -json -race ./... 2>&1 | tee ../.build/ui-tests.json | xunit -out ../.build/ui-tests.xml'
|
||||
sh 'cd testsuite/ui && go test -parallel 1 -p 1 -short -vet=off -timeout 5m -json -race ./... 2>&1 | tee ../../.build/ui-tests.json | xunit -out ../../.build/ui-tests.xml'
|
||||
}
|
||||
}
|
||||
post {
|
||||
|
14
Makefile
14
Makefile
@ -129,10 +129,10 @@ lint:
|
||||
storjlabs/ci-slim \
|
||||
make .lint LINT_TARGET="$(LINT_TARGET)"
|
||||
|
||||
.PHONY: .lint/testsuite
|
||||
.lint/testsuite:
|
||||
.PHONY: .lint/testsuite/ui
|
||||
.lint/testsuite/ui:
|
||||
go run ./scripts/lint.go \
|
||||
-work-dir testsuite \
|
||||
-work-dir testsuite/ui \
|
||||
-parallel 4 \
|
||||
-imports \
|
||||
-atomic-align \
|
||||
@ -141,14 +141,14 @@ lint:
|
||||
-golangci \
|
||||
$(LINT_TARGET)
|
||||
|
||||
.PHONY: lint/testsuite
|
||||
lint/testsuite:
|
||||
.PHONY: lint/testsuite/ui
|
||||
lint/testsuite/ui:
|
||||
docker run --rm -it \
|
||||
-v ${GOPATH}/pkg:/go/pkg \
|
||||
-v ${PWD}:/storj \
|
||||
-w /storj \
|
||||
storjlabs/ci \
|
||||
make .lint/testsuite LINT_TARGET="$(LINT_TARGET)"
|
||||
make .lint/testsuite/ui LINT_TARGET="$(LINT_TARGET)"
|
||||
|
||||
##@ Test
|
||||
|
||||
@ -568,7 +568,7 @@ diagrams-graphml:
|
||||
bump-dependencies:
|
||||
go get storj.io/common@main storj.io/private@main storj.io/uplink@main
|
||||
go mod tidy
|
||||
cd testsuite;\
|
||||
cd testsuite/ui;\
|
||||
go get storj.io/common@main storj.io/storj@main storj.io/uplink@main;\
|
||||
go mod tidy;
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
module storj.io/storj/testsuite
|
||||
module storj.io/storj/testsuite/ui
|
||||
|
||||
go 1.17
|
||||
|
||||
replace storj.io/storj => ../
|
||||
replace storj.io/storj => ../../
|
||||
|
||||
require (
|
||||
github.com/go-rod/rod v0.101.8
|
Loading…
Reference in New Issue
Block a user