octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-12-22 10:58:55 +00:00
Code Issues Releases Wiki Activity

Use flag instead of build tag to run integration tests

Browse Source
This commit is contained in:
Alexander Neumann 2015-06-05 22:33:39 +02:00
parent 7c107acf0b
commit 12677b4f8a
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -50,15 +50,15 @@ gox: .gopath $(SOURCE)
test-integration: .gopath test-integration: .gopath
cd $(BASEPATH) && go test $(GOTESTFLAGS) \ cd $(BASEPATH) && go test $(GOTESTFLAGS) \
-tags integration \
./backend \ ./backend \
-cover -covermode=count -coverprofile=integration-sftp.cov \ -cover -covermode=count -coverprofile=integration-sftp.cov \
-test.integration \
-test.sftppath=$(SFTP_PATH) -test.sftppath=$(SFTP_PATH)
cd $(BASEPATH) && go test $(GOTESTFLAGS) \ cd $(BASEPATH) && go test $(GOTESTFLAGS) \
-tags integration \
./cmd/restic \ ./cmd/restic \
-cover -covermode=count -coverprofile=integration.cov \ -cover -covermode=count -coverprofile=integration.cov \
-test.integration \
-test.datafile=$(PWD)/testsuite/fake-data.tar.gz -test.datafile=$(PWD)/testsuite/fake-data.tar.gz
all.cov: .gopath $(SOURCE) test-integration all.cov: .gopath $(SOURCE) test-integration

6
backend/sftp_test.go
View File

@ -1,5 +1,3 @@
// +build integration
package backend_test package backend_test
import ( import (
@ -37,6 +35,10 @@ func teardownSFTPBackend(t *testing.T, b *sftp.SFTP) {
} }
func TestSFTPBackend(t *testing.T) { func TestSFTPBackend(t *testing.T) {
if !*RunIntegrationTest {
t.Skip("integration tests disabled, use `-test.integration` to enable")
}
if *sftpPath == "" { if *sftpPath == "" {
t.Skipf("sftppath not set, skipping TestSFTPBackend") t.Skipf("sftppath not set, skipping TestSFTPBackend")
} }

2
cmd/restic/integration_helpers_test.go
View File

@ -1,5 +1,3 @@
// +build integration
package main package main
import ( import (

8
cmd/restic/integration_test.go
View File

@ -1,5 +1,3 @@
// +build integration
package main package main
import ( import (
@ -119,8 +117,12 @@ func cmdFsck(t testing.TB) {
} }
func TestBackup(t *testing.T) { func TestBackup(t *testing.T) {
if !*RunIntegrationTest {
t.Skip("integration tests disabled, use `-test.integration` to enable")
}
if *TestDataFile == "" { if *TestDataFile == "" {
t.Fatal("no data tar file specified, use flag '-test.datafile'") t.Fatal("no data tar file specified, use flag `-test.datafile`")
} }
tempdir := setupTempdir(t) tempdir := setupTempdir(t)

9
test/backend.go
View File

@ -12,9 +12,12 @@ import (
"github.com/restic/restic/repository" "github.com/restic/restic/repository"
) )
var TestPassword = flag.String("test.password", "geheim", `use this password for repositories created during tests (default: "geheim")`) var (
var TestCleanup = flag.Bool("test.cleanup", true, "clean up after running tests (remove local backend directory with all content)") TestPassword = flag.String("test.password", "geheim", `use this password for repositories created during tests (default: "geheim")`)
var TestTempDir = flag.String("test.tempdir", "", "use this directory for temporary storage (default: system temp dir)") TestCleanup = flag.Bool("test.cleanup", true, "clean up after running tests (remove local backend directory with all content)")
TestTempDir = flag.String("test.tempdir", "", "use this directory for temporary storage (default: system temp dir)")
RunIntegrationTest = flag.Bool("test.integration", false, "run integration tests (default: false)")
)
func SetupRepo(t testing.TB) *repository.Repository { func SetupRepo(t testing.TB) *repository.Repository {
tempdir, err := ioutil.TempDir(*TestTempDir, "restic-test-") tempdir, err := ioutil.TempDir(*TestTempDir, "restic-test-")