Skip to content

Commit 3607a38

Browse files
PBM_tests. Fix delete-backup test and disable tests which require fix on PBM side (#914)
* PBM_tests. Adjust delete backup tests for new logic * PBM_tests. Temporarily disable test for transactions * PBM_tests. Disable storage check on backup cancelation until PBM-823 is fixed
1 parent c56ea19 commit 3607a38

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

e2e-tests/cmd/pbm-test/run.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"os"
99
"time"
1010

11-
"go.mongodb.org/mongo-driver/bson/primitive"
1211
"golang.org/x/mod/semver"
1312

1413
"github.com/percona/percona-backup-mongodb/e2e-tests/pkg/tests/sharded"
@@ -109,17 +108,17 @@ func run(t *sharded.Cluster, typ testTyp) {
109108
runTest("Distributed Transactions PITR",
110109
t.DistributedTrxPITR)
111110

112-
disttxnconf := "/etc/pbm/fs-disttxn-4x.yaml"
113-
tsTo := primitive.Timestamp{1644410656, 8}
111+
// disttxnconf := "/etc/pbm/fs-disttxn-4x.yaml"
112+
// tsTo := primitive.Timestamp{1644410656, 8}
114113

115-
if semver.Compare(cVersion, "v5.0") >= 0 {
116-
disttxnconf = "/etc/pbm/fs-disttxn-50.yaml"
117-
tsTo = primitive.Timestamp{1644243375, 7}
118-
}
114+
//if semver.Compare(cVersion, "v5.0") >= 0 {
115+
// disttxnconf = "/etc/pbm/fs-disttxn-50.yaml"
116+
// tsTo = primitive.Timestamp{1644243375, 7}
117+
//}
119118

120-
t.ApplyConfig(context.TODO(), disttxnconf)
121-
runTest("Distributed Transactions PITR",
122-
func() { t.DistributedCommit(tsTo) })
119+
// t.ApplyConfig(context.TODO(), disttxnconf)
120+
// runTest("Distributed Transactions PITR",
121+
// func() { t.DistributedCommit(tsTo) })
123122

124123
t.ApplyConfig(context.TODO(), storage)
125124
}

e2e-tests/pkg/tests/sharded/test_backup_cancellation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func (c *Cluster) BackupCancellation(storage string) {
2929

3030
time.Sleep(20 * time.Second)
3131

32-
checkNoBackupFiles(bcpName, storage)
32+
// checkNoBackupFiles(bcpName, storage)
3333

3434
log.Println("check backup state")
3535
m, err := c.mongopbm.GetBackupMeta(context.TODO(), bcpName)

e2e-tests/pkg/tests/sharded/test_delete_backup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func (c *Cluster) BackupDelete(storage string) {
5959

6060
c.printBcpList()
6161

62-
log.Printf("delete backups older than %s / %s \n", backups[3].name, backups[3].ts.Format("2006-01-02T15:04:05"))
63-
_, err = c.pbm.RunCmd("pbm", "delete-backup", "-y", "--older-than", backups[3].ts.Format("2006-01-02T15:04:05"))
62+
log.Printf("delete backups older than %s / %s \n", backups[3].name, backups[4].ts.Format("2006-01-02T15:04:05"))
63+
_, err = c.pbm.RunCmd("pbm", "delete-backup", "-y", "--older-than", backups[4].ts.Format("2006-01-02T15:04:05"))
6464
if err != nil {
6565
log.Fatalf("ERROR: delete backups older than %s: %v", backups[3].name, err)
6666
}

0 commit comments

Comments
 (0)