Merge stable to develop #2446
Merged
Merge stable to develop #2446
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On import of mslib.mscolab.server initialize_managers was called once, hooking events up to handlers in a SocketsManager instance and initializing the Flask app with the Flask-SocketIO extension. Then, in handle_start, initialize_managers was called a second time, creating another SocketsManager object, overwriting the instance saved with the SocketIO object, and trying to initialize the Flask app with it again. The last step does not work though, a Flask app can only be initialized once with each extension (i.e. the sockio.init_app(app) call can only be done once per Flask app object). What this led to is that the Flask-SocketIO extension was using the first SocketsManager object to handle incoming events, while the server side was using the second SocketsManager object when it called methods on sockio.sm. This changes the startup process to do the initialization just once.
Previously test_sockets_manager.py communicated with a MSColab server running in a different process. This made it impossible to assert anything on the server state (e.g. on attributes of the SocketsManager object) due to the process boundary. Using a test client also simplifies the test setup quite a bit.
ReimarBauer
force-pushed
the
merge_stable_to_develop
branch
from
3121a27 to
f814dab
Compare
matrss
approved these changes
Aug 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of PR?:
gets the fixes in stable to develop
Needs a merge