From 54c83dcd96543574dc98a549a8d84c0e8cc278b5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 5 Dec 2023 07:14:26 +0100 Subject: [PATCH] Improve conversation test split to have more even execution times Signed-off-by: Joas Schilling --- .github/workflows/integration-mysql.yml | 2 +- .github/workflows/integration-oci.yml | 2 +- .github/workflows/integration-pgsql.yml | 2 +- .github/workflows/integration-sqlite.yml | 2 +- .../{conversation => conversation-1}/add-participant.feature | 0 .../features/{conversation => conversation-1}/avatar.feature | 0 .../{conversation => conversation-1}/breakout-rooms.feature | 0 .../bruteforce-protection.feature | 0 .../{conversation => conversation-1}/delete-room.feature | 0 .../{conversation => conversation-1}/delete-user.feature | 0 .../{conversation => conversation-1}/find-listed.feature | 0 .../{conversation => conversation-1}/join-listable.feature | 0 .../features/{conversation => conversation-2}/files.feature | 0 .../{conversation => conversation-2}/group-participants.feature | 0 .../{conversation => conversation-2}/invite-email.feature | 0 .../{conversation => conversation-2}/join-leave.feature | 0 .../{conversation => conversation-2}/limit-creation.feature | 0 .../features/{conversation => conversation-2}/lobby.feature | 0 .../{conversation-2 => conversation-3}/password-request.feature | 0 .../promotion-demotion.feature | 0 .../remove-participant.feature | 0 .../{conversation-2 => conversation-3}/remove-self.feature | 0 .../{conversation-2 => conversation-3}/rename-room.feature | 0 .../{conversation-2 => conversation-3}/set-description.feature | 0 .../{conversation-2 => conversation-3}/set-listable.feature | 0 .../set-participant-permissions.feature | 0 .../{conversation-2 => conversation-3}/set-password.feature | 0 .../{conversation-2 => conversation-3}/set-permissions.feature | 0 .../{conversation-2 => conversation-3}/sip-dialin.feature | 0 .../{conversation-2 => conversation-3}/sip-dialout.feature | 0 30 files changed, 4 insertions(+), 4 deletions(-) rename tests/integration/features/{conversation => conversation-1}/add-participant.feature (100%) rename tests/integration/features/{conversation => conversation-1}/avatar.feature (100%) rename tests/integration/features/{conversation => conversation-1}/breakout-rooms.feature (100%) rename tests/integration/features/{conversation => conversation-1}/bruteforce-protection.feature (100%) rename tests/integration/features/{conversation => conversation-1}/delete-room.feature (100%) rename tests/integration/features/{conversation => conversation-1}/delete-user.feature (100%) rename tests/integration/features/{conversation => conversation-1}/find-listed.feature (100%) rename tests/integration/features/{conversation => conversation-1}/join-listable.feature (100%) rename tests/integration/features/{conversation => conversation-2}/files.feature (100%) rename tests/integration/features/{conversation => conversation-2}/group-participants.feature (100%) rename tests/integration/features/{conversation => conversation-2}/invite-email.feature (100%) rename tests/integration/features/{conversation => conversation-2}/join-leave.feature (100%) rename tests/integration/features/{conversation => conversation-2}/limit-creation.feature (100%) rename tests/integration/features/{conversation => conversation-2}/lobby.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/password-request.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/promotion-demotion.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/remove-participant.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/remove-self.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/rename-room.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/set-description.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/set-listable.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/set-participant-permissions.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/set-password.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/set-permissions.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/sip-dialin.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/sip-dialout.feature (100%) diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml index 9ede8f4fe89..a727d0890be 100644 --- a/.github/workflows/integration-mysql.yml +++ b/.github/workflows/integration-mysql.yml @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2'] + test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'federation', 'integration', 'sharing', 'sharing-2'] php-versions: ['8.2'] server-versions: ['master'] guests-versions: ['master'] diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml index 9530912e3c8..98c3b3642af 100644 --- a/.github/workflows/integration-oci.yml +++ b/.github/workflows/integration-oci.yml @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2'] + test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'federation', 'integration', 'sharing', 'sharing-2'] php-versions: ['8.2'] server-versions: ['master'] guests-versions: ['master'] diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml index fb0207a78a1..7a291cc5ba2 100644 --- a/.github/workflows/integration-pgsql.yml +++ b/.github/workflows/integration-pgsql.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2'] + test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'federation', 'integration', 'sharing', 'sharing-2'] php-versions: ['8.3'] server-versions: ['master'] guests-versions: ['master'] diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index ee7bea5cf91..5adc134e795 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2'] + test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'federation', 'integration', 'sharing', 'sharing-2'] php-versions: ['8.2'] server-versions: ['master'] guests-versions: ['master'] diff --git a/tests/integration/features/conversation/add-participant.feature b/tests/integration/features/conversation-1/add-participant.feature similarity index 100% rename from tests/integration/features/conversation/add-participant.feature rename to tests/integration/features/conversation-1/add-participant.feature diff --git a/tests/integration/features/conversation/avatar.feature b/tests/integration/features/conversation-1/avatar.feature similarity index 100% rename from tests/integration/features/conversation/avatar.feature rename to tests/integration/features/conversation-1/avatar.feature diff --git a/tests/integration/features/conversation/breakout-rooms.feature b/tests/integration/features/conversation-1/breakout-rooms.feature similarity index 100% rename from tests/integration/features/conversation/breakout-rooms.feature rename to tests/integration/features/conversation-1/breakout-rooms.feature diff --git a/tests/integration/features/conversation/bruteforce-protection.feature b/tests/integration/features/conversation-1/bruteforce-protection.feature similarity index 100% rename from tests/integration/features/conversation/bruteforce-protection.feature rename to tests/integration/features/conversation-1/bruteforce-protection.feature diff --git a/tests/integration/features/conversation/delete-room.feature b/tests/integration/features/conversation-1/delete-room.feature similarity index 100% rename from tests/integration/features/conversation/delete-room.feature rename to tests/integration/features/conversation-1/delete-room.feature diff --git a/tests/integration/features/conversation/delete-user.feature b/tests/integration/features/conversation-1/delete-user.feature similarity index 100% rename from tests/integration/features/conversation/delete-user.feature rename to tests/integration/features/conversation-1/delete-user.feature diff --git a/tests/integration/features/conversation/find-listed.feature b/tests/integration/features/conversation-1/find-listed.feature similarity index 100% rename from tests/integration/features/conversation/find-listed.feature rename to tests/integration/features/conversation-1/find-listed.feature diff --git a/tests/integration/features/conversation/join-listable.feature b/tests/integration/features/conversation-1/join-listable.feature similarity index 100% rename from tests/integration/features/conversation/join-listable.feature rename to tests/integration/features/conversation-1/join-listable.feature diff --git a/tests/integration/features/conversation/files.feature b/tests/integration/features/conversation-2/files.feature similarity index 100% rename from tests/integration/features/conversation/files.feature rename to tests/integration/features/conversation-2/files.feature diff --git a/tests/integration/features/conversation/group-participants.feature b/tests/integration/features/conversation-2/group-participants.feature similarity index 100% rename from tests/integration/features/conversation/group-participants.feature rename to tests/integration/features/conversation-2/group-participants.feature diff --git a/tests/integration/features/conversation/invite-email.feature b/tests/integration/features/conversation-2/invite-email.feature similarity index 100% rename from tests/integration/features/conversation/invite-email.feature rename to tests/integration/features/conversation-2/invite-email.feature diff --git a/tests/integration/features/conversation/join-leave.feature b/tests/integration/features/conversation-2/join-leave.feature similarity index 100% rename from tests/integration/features/conversation/join-leave.feature rename to tests/integration/features/conversation-2/join-leave.feature diff --git a/tests/integration/features/conversation/limit-creation.feature b/tests/integration/features/conversation-2/limit-creation.feature similarity index 100% rename from tests/integration/features/conversation/limit-creation.feature rename to tests/integration/features/conversation-2/limit-creation.feature diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation-2/lobby.feature similarity index 100% rename from tests/integration/features/conversation/lobby.feature rename to tests/integration/features/conversation-2/lobby.feature diff --git a/tests/integration/features/conversation-2/password-request.feature b/tests/integration/features/conversation-3/password-request.feature similarity index 100% rename from tests/integration/features/conversation-2/password-request.feature rename to tests/integration/features/conversation-3/password-request.feature diff --git a/tests/integration/features/conversation-2/promotion-demotion.feature b/tests/integration/features/conversation-3/promotion-demotion.feature similarity index 100% rename from tests/integration/features/conversation-2/promotion-demotion.feature rename to tests/integration/features/conversation-3/promotion-demotion.feature diff --git a/tests/integration/features/conversation-2/remove-participant.feature b/tests/integration/features/conversation-3/remove-participant.feature similarity index 100% rename from tests/integration/features/conversation-2/remove-participant.feature rename to tests/integration/features/conversation-3/remove-participant.feature diff --git a/tests/integration/features/conversation-2/remove-self.feature b/tests/integration/features/conversation-3/remove-self.feature similarity index 100% rename from tests/integration/features/conversation-2/remove-self.feature rename to tests/integration/features/conversation-3/remove-self.feature diff --git a/tests/integration/features/conversation-2/rename-room.feature b/tests/integration/features/conversation-3/rename-room.feature similarity index 100% rename from tests/integration/features/conversation-2/rename-room.feature rename to tests/integration/features/conversation-3/rename-room.feature diff --git a/tests/integration/features/conversation-2/set-description.feature b/tests/integration/features/conversation-3/set-description.feature similarity index 100% rename from tests/integration/features/conversation-2/set-description.feature rename to tests/integration/features/conversation-3/set-description.feature diff --git a/tests/integration/features/conversation-2/set-listable.feature b/tests/integration/features/conversation-3/set-listable.feature similarity index 100% rename from tests/integration/features/conversation-2/set-listable.feature rename to tests/integration/features/conversation-3/set-listable.feature diff --git a/tests/integration/features/conversation-2/set-participant-permissions.feature b/tests/integration/features/conversation-3/set-participant-permissions.feature similarity index 100% rename from tests/integration/features/conversation-2/set-participant-permissions.feature rename to tests/integration/features/conversation-3/set-participant-permissions.feature diff --git a/tests/integration/features/conversation-2/set-password.feature b/tests/integration/features/conversation-3/set-password.feature similarity index 100% rename from tests/integration/features/conversation-2/set-password.feature rename to tests/integration/features/conversation-3/set-password.feature diff --git a/tests/integration/features/conversation-2/set-permissions.feature b/tests/integration/features/conversation-3/set-permissions.feature similarity index 100% rename from tests/integration/features/conversation-2/set-permissions.feature rename to tests/integration/features/conversation-3/set-permissions.feature diff --git a/tests/integration/features/conversation-2/sip-dialin.feature b/tests/integration/features/conversation-3/sip-dialin.feature similarity index 100% rename from tests/integration/features/conversation-2/sip-dialin.feature rename to tests/integration/features/conversation-3/sip-dialin.feature diff --git a/tests/integration/features/conversation-2/sip-dialout.feature b/tests/integration/features/conversation-3/sip-dialout.feature similarity index 100% rename from tests/integration/features/conversation-2/sip-dialout.feature rename to tests/integration/features/conversation-3/sip-dialout.feature