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

Fix botched merge from 14 Aug 23 in mscolab.py #2012

Merged
merged 1 commit into from
Sep 7, 2023
Merged

Conversation

joernu76
Copy link
Member

@joernu76 joernu76 commented Sep 7, 2023

Fixes #1969

Purpose of PR?:

Fixes #

Does this PR introduce a breaking change?
no

@joernu76
Copy link
Member Author

joernu76 commented Sep 7, 2023

I tried to recreate the merge from 14 Aug 2023 and tried to add the stuff I think was missing from my fixes back into develop. This should align stable and develop greatly.

Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created a test_for_leave op (category:devel) on the staging server you and me are added. When I get the OP pushed into the navigation and click on it, I get this failure.
Also the navigation elements remain inactive for me.

On relogin I don't have this.

branch develop: Same problem
branch stable: it works perfect

So we broke this in develop.

Fatal error in MSS 8.3.0 on Linux-6.2.0-10018-tuxedo-x86_64-with-glibc2.35
Python 3.10.8 | packaged by conda-forge | (main, Nov 22 2022, 08:23:14) [GCC 10.4.0]

Please report bugs in MSS to https://github.com/Open-MSS/MSS

Information about the fatal error:

Traceback (most recent call last):
  File "/home/reimar/MAIN/MSS/mslib/msui/mscolab.py", line 1707, in set_active_op_id
    self.active_operation_category = item.operation_category
AttributeError: 'QListWidgetItem' object has no attribute 'operation_category'

The peek shows a pushed operation into my account and what happens afterwards.

problem_in_develop

@ReimarBauer
Copy link
Member

I had not tracked it further down, if that happens with the merge too. Maybe you can look on it within this PR? Or we create a different PR. (I am looking for writing a test for that problem, so it gets easier catched.)

@joernu76
Copy link
Member Author

joernu76 commented Sep 7, 2023

Again, I could only properly review my extensive changes to mscolab.py. AFAIK, you changed some things with the category stuff. I can try to have a look, but it might be more efficient if you compare the files. give me a second.

@joernu76
Copy link
Member Author

joernu76 commented Sep 7, 2023

Both develop and stable seem to have a bug in category, where both a "catgegory" and "operation_category" attribute is set. I added a fix (and a resort to make comparing the set attributes simpler).
This needs a fix in stable as well, though, so I am not sure if this is the error you have there.
It coould explain your error behaviour though.
I prepare a fix for stable as well.

@ReimarBauer
Copy link
Member

Both develop and stable seem to have a bug in category, where both a "catgegory" and "operation_category" attribute is set. I added a fix (and a resort to make comparing the set attributes simpler). This needs a fix in stable as well, though, so I am not sure if this is the error you have there. It coould explain your error behaviour though. I prepare a fix for stable as well.

I recognized that the problem above is also in ju_special, I create a seperate issue for that. With the push also a reload of the operations or something similiar needs to be triggered. The reload was the past "slow" solution

Copy link
Member

@ReimarBauer ReimarBauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the merge was not covered enough by tests.

@ReimarBauer ReimarBauer merged commit 1db1f27 into develop Sep 7, 2023
4 checks passed
@ReimarBauer ReimarBauer deleted the i1969b branch September 7, 2023 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

another fatal, uncaught timeout-related exception in mscolab upon activating an operation
2 participants