Skip to content

Commit

Permalink
Get tests passing when shuffled
Browse files Browse the repository at this point in the history
  • Loading branch information
theandrew168 committed May 4, 2024
1 parent e480620 commit f0837e4
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 6 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build:

.PHONY: test
test:
go test -count=1 ./...
go test -count=1 -shuffle=on -race -vet=all -failfast ./...

.PHONY: cover
cover:
Expand All @@ -21,10 +21,6 @@ cover:
release:
goreleaser release --clean --snapshot

.PHONY: lint
lint:
go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run --fast

.PHONY: format
format:
gofmt -l -s -w .
Expand Down
58 changes: 57 additions & 1 deletion internal/pg2s3/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,34 @@ func TestRestore(t *testing.T) {
t.Fatal(err)
}

// generate name for backup
name, err := pg2s3.GenerateBackupName(cfg.Backup.Prefix)
if err != nil {
t.Fatal(err)
}

// create backup
backup, err := client.CreateBackup()
if err != nil {
t.Fatal(err)
}

// encrypt backup (if applicable)
if len(cfg.Encryption.PublicKeys) > 0 {
backup, err = client.EncryptBackup(backup, cfg.Encryption.PublicKeys)
if err != nil {
t.Fatal(err)
}

name = name + ".age"
}

// upload backup
err = client.UploadBackup(name, backup)
if err != nil {
t.Fatal(err)
}

// list all backups
backups, err := client.ListBackups()
if err != nil {
Expand All @@ -123,7 +151,7 @@ func TestRestore(t *testing.T) {
latest := backups[0]

// download backup
backup, err := client.DownloadBackup(latest)
backup, err = client.DownloadBackup(latest)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -155,6 +183,34 @@ func TestPrune(t *testing.T) {
t.Fatal(err)
}

// generate name for backup
name, err := pg2s3.GenerateBackupName(cfg.Backup.Prefix)
if err != nil {
t.Fatal(err)
}

// create backup
backup, err := client.CreateBackup()
if err != nil {
t.Fatal(err)
}

// encrypt backup (if applicable)
if len(cfg.Encryption.PublicKeys) > 0 {
backup, err = client.EncryptBackup(backup, cfg.Encryption.PublicKeys)
if err != nil {
t.Fatal(err)
}

name = name + ".age"
}

// upload backup
err = client.UploadBackup(name, backup)
if err != nil {
t.Fatal(err)
}

// list all backups
backups, err := client.ListBackups()
if err != nil {
Expand Down

0 comments on commit f0837e4

Please sign in to comment.