From 1dd2bc3d420490d9ce608dd4c22a9f1abd3656e9 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 +- tests/integration/features/{chat => chat-1}/bots.feature | 0 tests/integration/features/{chat => chat-1}/commands.feature | 0 tests/integration/features/{chat => chat-1}/delete.feature | 0 tests/integration/features/{chat => chat-1}/file-share.feature | 0 .../features/{chat => chat-1}/group-read-only.feature | 0 tests/integration/features/{chat => chat-1}/group.feature | 0 tests/integration/features/{chat => chat-1}/mentions.feature | 0 .../features/{chat => chat-1}/message-expiration.feature | 0 .../integration/features/{chat => chat-1}/note-to-self.feature | 0 .../integration/features/{chat => chat-1}/notifications.feature | 0 tests/integration/features/{chat => chat-1}/one-to-one.feature | 0 tests/integration/features/{chat => chat-1}/password.feature | 0 .../{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 .../features/{conversation => conversation-2}/files.feature | 0 .../{conversation => conversation-2}/find-listed.feature | 0 .../{conversation => conversation-2}/join-listable.feature | 0 .../{conversation => conversation-3}/group-participants.feature | 0 .../{conversation => conversation-3}/invite-email.feature | 0 .../{conversation => conversation-3}/join-leave.feature | 0 .../{conversation => conversation-3}/limit-creation.feature | 0 .../features/{conversation => conversation-3}/lobby.feature | 0 .../{conversation-2 => conversation-3}/one-to-one.feature | 0 .../{conversation-2 => conversation-3}/public-private.feature | 0 .../{conversation-2 => conversation-4}/password-request.feature | 0 .../promotion-demotion.feature | 0 .../remove-participant.feature | 0 .../{conversation-2 => conversation-4}/remove-self.feature | 0 .../{conversation-2 => conversation-4}/rename-room.feature | 0 .../{conversation-2 => conversation-5}/set-description.feature | 0 .../{conversation-2 => conversation-5}/set-listable.feature | 0 .../set-participant-permissions.feature | 0 .../{conversation-2 => conversation-5}/set-password.feature | 0 .../{conversation-2 => conversation-5}/set-permissions.feature | 0 .../{conversation-2 => conversation-5}/sip-dialin.feature | 0 .../{conversation-2 => conversation-5}/sip-dialout.feature | 0 .../integration/features/{sharing => sharing-1}/create.feature | 0 .../integration/features/{sharing => sharing-1}/delete.feature | 0 tests/integration/features/{sharing => sharing-1}/move.feature | 0 .../integration/features/{sharing => sharing-1}/restore.feature | 0 .../integration/features/{sharing-2 => sharing-3}/hooks.feature | 0 .../integration/features/{sharing => sharing-4}/sharees.feature | 0 .../features/{sharing => sharing-4}/transfer-ownership.feature | 0 .../integration/features/{sharing => sharing-4}/update.feature | 0 52 files changed, 4 insertions(+), 4 deletions(-) rename tests/integration/features/{chat => chat-1}/bots.feature (100%) rename tests/integration/features/{chat => chat-1}/commands.feature (100%) rename tests/integration/features/{chat => chat-1}/delete.feature (100%) rename tests/integration/features/{chat => chat-1}/file-share.feature (100%) rename tests/integration/features/{chat => chat-1}/group-read-only.feature (100%) rename tests/integration/features/{chat => chat-1}/group.feature (100%) rename tests/integration/features/{chat => chat-1}/mentions.feature (100%) rename tests/integration/features/{chat => chat-1}/message-expiration.feature (100%) rename tests/integration/features/{chat => chat-1}/note-to-self.feature (100%) rename tests/integration/features/{chat => chat-1}/notifications.feature (100%) rename tests/integration/features/{chat => chat-1}/one-to-one.feature (100%) rename tests/integration/features/{chat => chat-1}/password.feature (100%) 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-2}/files.feature (100%) rename tests/integration/features/{conversation => conversation-2}/find-listed.feature (100%) rename tests/integration/features/{conversation => conversation-2}/join-listable.feature (100%) rename tests/integration/features/{conversation => conversation-3}/group-participants.feature (100%) rename tests/integration/features/{conversation => conversation-3}/invite-email.feature (100%) rename tests/integration/features/{conversation => conversation-3}/join-leave.feature (100%) rename tests/integration/features/{conversation => conversation-3}/limit-creation.feature (100%) rename tests/integration/features/{conversation => conversation-3}/lobby.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/one-to-one.feature (100%) rename tests/integration/features/{conversation-2 => conversation-3}/public-private.feature (100%) rename tests/integration/features/{conversation-2 => conversation-4}/password-request.feature (100%) rename tests/integration/features/{conversation-2 => conversation-4}/promotion-demotion.feature (100%) rename tests/integration/features/{conversation-2 => conversation-4}/remove-participant.feature (100%) rename tests/integration/features/{conversation-2 => conversation-4}/remove-self.feature (100%) rename tests/integration/features/{conversation-2 => conversation-4}/rename-room.feature (100%) rename tests/integration/features/{conversation-2 => conversation-5}/set-description.feature (100%) rename tests/integration/features/{conversation-2 => conversation-5}/set-listable.feature (100%) rename tests/integration/features/{conversation-2 => conversation-5}/set-participant-permissions.feature (100%) rename tests/integration/features/{conversation-2 => conversation-5}/set-password.feature (100%) rename tests/integration/features/{conversation-2 => conversation-5}/set-permissions.feature (100%) rename tests/integration/features/{conversation-2 => conversation-5}/sip-dialin.feature (100%) rename tests/integration/features/{conversation-2 => conversation-5}/sip-dialout.feature (100%) rename tests/integration/features/{sharing => sharing-1}/create.feature (100%) rename tests/integration/features/{sharing => sharing-1}/delete.feature (100%) rename tests/integration/features/{sharing => sharing-1}/move.feature (100%) rename tests/integration/features/{sharing => sharing-1}/restore.feature (100%) rename tests/integration/features/{sharing-2 => sharing-3}/hooks.feature (100%) rename tests/integration/features/{sharing => sharing-4}/sharees.feature (100%) rename tests/integration/features/{sharing => sharing-4}/transfer-ownership.feature (100%) rename tests/integration/features/{sharing => sharing-4}/update.feature (100%) diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml index b05ff11b80d..5b102eac7a0 100644 --- a/.github/workflows/integration-mysql.yml +++ b/.github/workflows/integration-mysql.yml @@ -53,7 +53,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-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.2'] server-versions: ['stable28'] guests-versions: ['master'] diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml index c3de1877c91..e92b9bed002 100644 --- a/.github/workflows/integration-oci.yml +++ b/.github/workflows/integration-oci.yml @@ -53,7 +53,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-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.2'] server-versions: ['stable28'] guests-versions: ['master'] diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml index 231457f2787..1ef4bab5257 100644 --- a/.github/workflows/integration-pgsql.yml +++ b/.github/workflows/integration-pgsql.yml @@ -50,7 +50,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-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.3'] server-versions: ['stable28'] guests-versions: ['master'] diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index f1e858ab7f6..780e43bbcf6 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -53,7 +53,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-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4'] php-versions: ['8.2'] server-versions: ['stable28'] guests-versions: ['master'] diff --git a/tests/integration/features/chat/bots.feature b/tests/integration/features/chat-1/bots.feature similarity index 100% rename from tests/integration/features/chat/bots.feature rename to tests/integration/features/chat-1/bots.feature diff --git a/tests/integration/features/chat/commands.feature b/tests/integration/features/chat-1/commands.feature similarity index 100% rename from tests/integration/features/chat/commands.feature rename to tests/integration/features/chat-1/commands.feature diff --git a/tests/integration/features/chat/delete.feature b/tests/integration/features/chat-1/delete.feature similarity index 100% rename from tests/integration/features/chat/delete.feature rename to tests/integration/features/chat-1/delete.feature diff --git a/tests/integration/features/chat/file-share.feature b/tests/integration/features/chat-1/file-share.feature similarity index 100% rename from tests/integration/features/chat/file-share.feature rename to tests/integration/features/chat-1/file-share.feature diff --git a/tests/integration/features/chat/group-read-only.feature b/tests/integration/features/chat-1/group-read-only.feature similarity index 100% rename from tests/integration/features/chat/group-read-only.feature rename to tests/integration/features/chat-1/group-read-only.feature diff --git a/tests/integration/features/chat/group.feature b/tests/integration/features/chat-1/group.feature similarity index 100% rename from tests/integration/features/chat/group.feature rename to tests/integration/features/chat-1/group.feature diff --git a/tests/integration/features/chat/mentions.feature b/tests/integration/features/chat-1/mentions.feature similarity index 100% rename from tests/integration/features/chat/mentions.feature rename to tests/integration/features/chat-1/mentions.feature diff --git a/tests/integration/features/chat/message-expiration.feature b/tests/integration/features/chat-1/message-expiration.feature similarity index 100% rename from tests/integration/features/chat/message-expiration.feature rename to tests/integration/features/chat-1/message-expiration.feature diff --git a/tests/integration/features/chat/note-to-self.feature b/tests/integration/features/chat-1/note-to-self.feature similarity index 100% rename from tests/integration/features/chat/note-to-self.feature rename to tests/integration/features/chat-1/note-to-self.feature diff --git a/tests/integration/features/chat/notifications.feature b/tests/integration/features/chat-1/notifications.feature similarity index 100% rename from tests/integration/features/chat/notifications.feature rename to tests/integration/features/chat-1/notifications.feature diff --git a/tests/integration/features/chat/one-to-one.feature b/tests/integration/features/chat-1/one-to-one.feature similarity index 100% rename from tests/integration/features/chat/one-to-one.feature rename to tests/integration/features/chat-1/one-to-one.feature diff --git a/tests/integration/features/chat/password.feature b/tests/integration/features/chat-1/password.feature similarity index 100% rename from tests/integration/features/chat/password.feature rename to tests/integration/features/chat-1/password.feature 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/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/find-listed.feature b/tests/integration/features/conversation-2/find-listed.feature similarity index 100% rename from tests/integration/features/conversation/find-listed.feature rename to tests/integration/features/conversation-2/find-listed.feature diff --git a/tests/integration/features/conversation/join-listable.feature b/tests/integration/features/conversation-2/join-listable.feature similarity index 100% rename from tests/integration/features/conversation/join-listable.feature rename to tests/integration/features/conversation-2/join-listable.feature diff --git a/tests/integration/features/conversation/group-participants.feature b/tests/integration/features/conversation-3/group-participants.feature similarity index 100% rename from tests/integration/features/conversation/group-participants.feature rename to tests/integration/features/conversation-3/group-participants.feature diff --git a/tests/integration/features/conversation/invite-email.feature b/tests/integration/features/conversation-3/invite-email.feature similarity index 100% rename from tests/integration/features/conversation/invite-email.feature rename to tests/integration/features/conversation-3/invite-email.feature diff --git a/tests/integration/features/conversation/join-leave.feature b/tests/integration/features/conversation-3/join-leave.feature similarity index 100% rename from tests/integration/features/conversation/join-leave.feature rename to tests/integration/features/conversation-3/join-leave.feature diff --git a/tests/integration/features/conversation/limit-creation.feature b/tests/integration/features/conversation-3/limit-creation.feature similarity index 100% rename from tests/integration/features/conversation/limit-creation.feature rename to tests/integration/features/conversation-3/limit-creation.feature diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation-3/lobby.feature similarity index 100% rename from tests/integration/features/conversation/lobby.feature rename to tests/integration/features/conversation-3/lobby.feature diff --git a/tests/integration/features/conversation-2/one-to-one.feature b/tests/integration/features/conversation-3/one-to-one.feature similarity index 100% rename from tests/integration/features/conversation-2/one-to-one.feature rename to tests/integration/features/conversation-3/one-to-one.feature diff --git a/tests/integration/features/conversation-2/public-private.feature b/tests/integration/features/conversation-3/public-private.feature similarity index 100% rename from tests/integration/features/conversation-2/public-private.feature rename to tests/integration/features/conversation-3/public-private.feature diff --git a/tests/integration/features/conversation-2/password-request.feature b/tests/integration/features/conversation-4/password-request.feature similarity index 100% rename from tests/integration/features/conversation-2/password-request.feature rename to tests/integration/features/conversation-4/password-request.feature diff --git a/tests/integration/features/conversation-2/promotion-demotion.feature b/tests/integration/features/conversation-4/promotion-demotion.feature similarity index 100% rename from tests/integration/features/conversation-2/promotion-demotion.feature rename to tests/integration/features/conversation-4/promotion-demotion.feature diff --git a/tests/integration/features/conversation-2/remove-participant.feature b/tests/integration/features/conversation-4/remove-participant.feature similarity index 100% rename from tests/integration/features/conversation-2/remove-participant.feature rename to tests/integration/features/conversation-4/remove-participant.feature diff --git a/tests/integration/features/conversation-2/remove-self.feature b/tests/integration/features/conversation-4/remove-self.feature similarity index 100% rename from tests/integration/features/conversation-2/remove-self.feature rename to tests/integration/features/conversation-4/remove-self.feature diff --git a/tests/integration/features/conversation-2/rename-room.feature b/tests/integration/features/conversation-4/rename-room.feature similarity index 100% rename from tests/integration/features/conversation-2/rename-room.feature rename to tests/integration/features/conversation-4/rename-room.feature diff --git a/tests/integration/features/conversation-2/set-description.feature b/tests/integration/features/conversation-5/set-description.feature similarity index 100% rename from tests/integration/features/conversation-2/set-description.feature rename to tests/integration/features/conversation-5/set-description.feature diff --git a/tests/integration/features/conversation-2/set-listable.feature b/tests/integration/features/conversation-5/set-listable.feature similarity index 100% rename from tests/integration/features/conversation-2/set-listable.feature rename to tests/integration/features/conversation-5/set-listable.feature diff --git a/tests/integration/features/conversation-2/set-participant-permissions.feature b/tests/integration/features/conversation-5/set-participant-permissions.feature similarity index 100% rename from tests/integration/features/conversation-2/set-participant-permissions.feature rename to tests/integration/features/conversation-5/set-participant-permissions.feature diff --git a/tests/integration/features/conversation-2/set-password.feature b/tests/integration/features/conversation-5/set-password.feature similarity index 100% rename from tests/integration/features/conversation-2/set-password.feature rename to tests/integration/features/conversation-5/set-password.feature diff --git a/tests/integration/features/conversation-2/set-permissions.feature b/tests/integration/features/conversation-5/set-permissions.feature similarity index 100% rename from tests/integration/features/conversation-2/set-permissions.feature rename to tests/integration/features/conversation-5/set-permissions.feature diff --git a/tests/integration/features/conversation-2/sip-dialin.feature b/tests/integration/features/conversation-5/sip-dialin.feature similarity index 100% rename from tests/integration/features/conversation-2/sip-dialin.feature rename to tests/integration/features/conversation-5/sip-dialin.feature diff --git a/tests/integration/features/conversation-2/sip-dialout.feature b/tests/integration/features/conversation-5/sip-dialout.feature similarity index 100% rename from tests/integration/features/conversation-2/sip-dialout.feature rename to tests/integration/features/conversation-5/sip-dialout.feature diff --git a/tests/integration/features/sharing/create.feature b/tests/integration/features/sharing-1/create.feature similarity index 100% rename from tests/integration/features/sharing/create.feature rename to tests/integration/features/sharing-1/create.feature diff --git a/tests/integration/features/sharing/delete.feature b/tests/integration/features/sharing-1/delete.feature similarity index 100% rename from tests/integration/features/sharing/delete.feature rename to tests/integration/features/sharing-1/delete.feature diff --git a/tests/integration/features/sharing/move.feature b/tests/integration/features/sharing-1/move.feature similarity index 100% rename from tests/integration/features/sharing/move.feature rename to tests/integration/features/sharing-1/move.feature diff --git a/tests/integration/features/sharing/restore.feature b/tests/integration/features/sharing-1/restore.feature similarity index 100% rename from tests/integration/features/sharing/restore.feature rename to tests/integration/features/sharing-1/restore.feature diff --git a/tests/integration/features/sharing-2/hooks.feature b/tests/integration/features/sharing-3/hooks.feature similarity index 100% rename from tests/integration/features/sharing-2/hooks.feature rename to tests/integration/features/sharing-3/hooks.feature diff --git a/tests/integration/features/sharing/sharees.feature b/tests/integration/features/sharing-4/sharees.feature similarity index 100% rename from tests/integration/features/sharing/sharees.feature rename to tests/integration/features/sharing-4/sharees.feature diff --git a/tests/integration/features/sharing/transfer-ownership.feature b/tests/integration/features/sharing-4/transfer-ownership.feature similarity index 100% rename from tests/integration/features/sharing/transfer-ownership.feature rename to tests/integration/features/sharing-4/transfer-ownership.feature diff --git a/tests/integration/features/sharing/update.feature b/tests/integration/features/sharing-4/update.feature similarity index 100% rename from tests/integration/features/sharing/update.feature rename to tests/integration/features/sharing-4/update.feature