Skip to content

Commit 0b322b0

Browse files
authored
Revise delete tests (CrunchyData#3822)
Revise delete KUTTL tests * Use files for legibility * Add describe/log collectors to every assert
1 parent c2f003a commit 0b322b0

27 files changed

+148
-83
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestAssert
3+
collectors:
4+
- type: command
5+
command: kubectl -n ${KUTTL_TEST_DELETE_NAMESPACE} describe pods --selector postgres-operator.crunchydata.com/cluster=delete-namespace
6+
- namespace: ${KUTTL_TEST_DELETE_NAMESPACE}
7+
selector: postgres-operator.crunchydata.com/cluster=delete-namespace
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
apply:
4+
- files/00-create-namespace.yaml
5+
- files/00-create-cluster.yaml
6+
assert:
7+
- files/00-created.yaml
Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1-
---
2-
apiVersion: postgres-operator.crunchydata.com/v1beta1
3-
kind: PostgresCluster
4-
metadata:
5-
name: delete-namespace
6-
namespace: ${KUTTL_TEST_DELETE_NAMESPACE}
7-
status:
8-
instances:
9-
- name: instance1
10-
readyReplicas: 1
11-
replicas: 1
12-
updatedReplicas: 1
13-
---
14-
apiVersion: batch/v1
15-
kind: Job
16-
metadata:
17-
namespace: ${KUTTL_TEST_DELETE_NAMESPACE}
18-
labels:
19-
postgres-operator.crunchydata.com/cluster: delete-namespace
20-
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
21-
status:
22-
succeeded: 1
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestAssert
3+
collectors:
4+
- type: command
5+
command: kubectl -n ${KUTTL_TEST_DELETE_NAMESPACE} describe pods --selector postgres-operator.crunchydata.com/cluster=delete-namespace
6+
- namespace: ${KUTTL_TEST_DELETE_NAMESPACE}
7+
selector: postgres-operator.crunchydata.com/cluster=delete-namespace

testing/kuttl/e2e/delete-namespace/02--delete-namespace.yaml renamed to testing/kuttl/e2e/delete-namespace/01-delete-namespace.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ delete:
66
- apiVersion: v1
77
kind: Namespace
88
name: ${KUTTL_TEST_DELETE_NAMESPACE}
9+
error:
10+
- files/01-errors.yaml

testing/kuttl/e2e/delete-namespace/01--cluster.yaml renamed to testing/kuttl/e2e/delete-namespace/files/00-create-cluster.yaml

File renamed without changes.

testing/kuttl/e2e/delete-namespace/00--namespace.yaml renamed to testing/kuttl/e2e/delete-namespace/files/00-create-namespace.yaml

File renamed without changes.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
apiVersion: postgres-operator.crunchydata.com/v1beta1
3+
kind: PostgresCluster
4+
metadata:
5+
name: delete-namespace
6+
namespace: ${KUTTL_TEST_DELETE_NAMESPACE}
7+
status:
8+
instances:
9+
- name: instance1
10+
readyReplicas: 1
11+
replicas: 1
12+
updatedReplicas: 1
13+
---
14+
apiVersion: batch/v1
15+
kind: Job
16+
metadata:
17+
namespace: ${KUTTL_TEST_DELETE_NAMESPACE}
18+
labels:
19+
postgres-operator.crunchydata.com/cluster: delete-namespace
20+
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
21+
status:
22+
succeeded: 1
File renamed without changes.
Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
1-
---
2-
apiVersion: postgres-operator.crunchydata.com/v1beta1
3-
kind: PostgresCluster
4-
metadata:
5-
name: delete
6-
status:
7-
instances:
8-
- name: instance1
9-
readyReplicas: 1
10-
replicas: 1
11-
updatedReplicas: 1
12-
---
13-
apiVersion: batch/v1
14-
kind: Job
15-
metadata:
16-
labels:
17-
postgres-operator.crunchydata.com/cluster: delete
18-
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
19-
status:
20-
succeeded: 1
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestAssert
3+
collectors:
4+
- type: command
5+
command: kubectl -n $NAMESPACE describe pods --selector postgres-operator.crunchydata.com/cluster=delete
6+
- namespace: $NAMESPACE
7+
selector: postgres-operator.crunchydata.com/cluster=delete
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
apply:
4+
- files/00-create-cluster.yaml
5+
assert:
6+
- files/00-cluster-created.yaml

0 commit comments

Comments
 (0)