fix(e2e): use runtime Skip for GCS tests instead of removing them

Deleting the GCS Entry() calls dropped e2e coverage permanently and
left the GCS factory types and fakegcsserver.go referenced nowhere.
Ginkgo's --fail-on-pending forbids Pending/XEntry, but a runtime
Skip() inside the shared spec body avoids that check while keeping
the factories wired up, making it easier to notice and re-enable the
tests once EnterpriseDB/barman#1218 is fixed.

Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
This commit is contained in:
Marco Nenciarini 2026-09-02 11:04:45 +02:00
parent 320057339e
commit db6b1818c5
No known key found for this signature in database
GPG Key ID: 589F03F01BA55038
2 changed files with 25 additions and 0 deletions

View File

@ -56,6 +56,12 @@ var _ = Describe("Backup and restore", func() {
ctx SpecContext, ctx SpecContext,
factory testCaseFactory, factory testCaseFactory,
) { ) {
switch factory.(type) {
case *gcsBackupPluginBackupPluginRestore, *gcsBackupPluginBackupInTreeRestore,
*gcsBackupPluginInTreeBackupPluginRestore:
Skip("GCS e2e tests are disabled until https://github.com/EnterpriseDB/barman/issues/1218 is fixed")
}
testResources := factory.createBackupRestoreTestResources(namespace.Name) testResources := factory.createBackupRestoreTestResources(namespace.Name)
By("starting the ObjectStore deployment") By("starting the ObjectStore deployment")
@ -198,5 +204,15 @@ var _ = Describe("Backup and restore", func() {
"using in-tree for backup and the plugin for restore on Azure", "using in-tree for backup and the plugin for restore on Azure",
&azureBackupPluginInTreeBackupPluginRestore{}, &azureBackupPluginInTreeBackupPluginRestore{},
), ),
Entry("using the plugin for backup and restore on GCS",
&gcsBackupPluginBackupPluginRestore{},
),
Entry("using the plugin for backup and in-tree for restore on GCS",
&gcsBackupPluginBackupInTreeRestore{},
),
Entry(
"using in-tree for backup and the plugin for restore on GCS",
&gcsBackupPluginInTreeBackupPluginRestore{},
),
) )
}) })

View File

@ -57,6 +57,11 @@ var _ = Describe("Replica cluster", func() {
ctx SpecContext, ctx SpecContext,
factory testCaseFactory, factory testCaseFactory,
) { ) {
switch factory.(type) {
case gcsReplicaClusterFactory:
Skip("GCS e2e tests are disabled until https://github.com/EnterpriseDB/barman/issues/1218 is fixed")
}
testResources := factory.createReplicaClusterTestResources(namespace.Name) testResources := factory.createReplicaClusterTestResources(namespace.Name)
By("starting the ObjectStore deployments") By("starting the ObjectStore deployments")
@ -268,5 +273,9 @@ var _ = Describe("Replica cluster", func() {
"with Azurite", "with Azurite",
azuriteReplicaClusterFactory{}, azuriteReplicaClusterFactory{},
), ),
Entry(
"with fake-gcs-server",
gcsReplicaClusterFactory{},
),
) )
}) })