Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][FIX] bus, im_livechat: fix non deterministic discuss sidebar test #165305

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented May 13, 2024

Before this PR, the "unknown livechat can be displayed and interacted with" test was sometimes failing.

This was due to a race condition between the sending of a message and the unpinning of the live chat channel.

Specifically, the test removed the live chat from the discuss sidebar, but the channel remained pinned when the message was sent. If the live chat was unpinned before the reception of the new message notification, it remained in the sidebar, causing the test to fail.

fixes runbot-61160

Forward-Port-Of: #165204

@robodoo
Copy link
Contributor

robodoo commented May 13, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented May 13, 2024

@tsm-odoo @alexkuhn cherrypicking of pull request #165204 failed.

stdout:

Auto-merging addons/bus/static/tests/bus_test_helpers.js
CONFLICT (content): Merge conflict in addons/bus/static/tests/bus_test_helpers.js
Auto-merging addons/im_livechat/static/tests/sidebar_patch.test.js

stderr:

20:28:19.868986 git.c:463               trace: built-in: git cherry-pick e71cf5c4d35dca134de963560e4b2942d42ab75d
error: could not apply e71cf5c4d35d... [FIX] bus, im_livechat: fix non deterministic discuss sidebar test
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels May 13, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label May 13, 2024
Before this PR, the "unknown livechat can be displayed and interacted
with" test was sometimes failing.

This was due to a race condition between the sending of a message and
the unpinning of the live chat channel.

Specifically, the test removed the live chat from the discuss sidebar,
but the channel remained pinned when the message was sent. If the live
chat was unpinned before the reception of the new message
notification, it remained in the sidebar, causing the test to fail.

fixes runbot-61160

X-original-commit: e055c08
@tsm-odoo tsm-odoo force-pushed the master-saas-17.2-mail-runbot_error_61160-tsm-On8o-fw branch from 2b3fc72 to 4d94727 Compare May 14, 2024 07:05
@tsm-odoo
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo requested review from a team, aab-odoo, kebeclibre and Julien00859 and removed request for a team May 14, 2024 07:08
robodoo pushed a commit that referenced this pull request May 14, 2024
Before this PR, the "unknown livechat can be displayed and interacted
with" test was sometimes failing.

This was due to a race condition between the sending of a message and
the unpinning of the live chat channel.

Specifically, the test removed the live chat from the discuss sidebar,
but the channel remained pinned when the message was sent. If the live
chat was unpinned before the reception of the new message
notification, it remained in the sidebar, causing the test to fail.

fixes runbot-61160

closes #165305

X-original-commit: e055c08
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
@robodoo robodoo closed this May 14, 2024
@robodoo robodoo added the 17.3 label May 14, 2024
chevalierv pushed a commit to odoo-dev/odoo that referenced this pull request May 17, 2024
Before this PR, the "unknown livechat can be displayed and interacted
with" test was sometimes failing.

This was due to a race condition between the sending of a message and
the unpinning of the live chat channel.

Specifically, the test removed the live chat from the discuss sidebar,
but the channel remained pinned when the message was sent. If the live
chat was unpinned before the reception of the new message
notification, it remained in the sidebar, causing the test to fail.

fixes runbot-61160

closes odoo#165305

X-original-commit: e055c08
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
zel-odoo pushed a commit to odoo-dev/odoo that referenced this pull request May 24, 2024
Before this PR, the "unknown livechat can be displayed and interacted
with" test was sometimes failing.

This was due to a race condition between the sending of a message and
the unpinning of the live chat channel.

Specifically, the test removed the live chat from the discuss sidebar,
but the channel remained pinned when the message was sent. If the live
chat was unpinned before the reception of the new message
notification, it remained in the sidebar, causing the test to fail.

fixes runbot-61160

closes odoo#165305

X-original-commit: e055c08
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
@fw-bot fw-bot deleted the master-saas-17.2-mail-runbot_error_61160-tsm-On8o-fw branch May 28, 2024 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
17.3 conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants