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

Updates to support Fedora #134

Merged
merged 1 commit into from
Mar 7, 2024

Conversation

spoore1
Copy link
Contributor

@spoore1 spoore1 commented Feb 7, 2024

controller.py:

  • dnf groups 'Server with GUI' and 'Smart Card Support' do not exist in Fedora. Running dnf installs for minimal packages in these cases.
  • python3-uinput is needed in newer version of Fedora instead of the older python-uinput used from Pypi. Older version uses a deprecated sysconfig variable (SO) which is fixed in python3-uinput.
  • rsyslog is needed by the tests for checking /var/log/secure.

setup.py:

  • dropping python-uinput to let the controller install the appropriate version.

@spoore1 spoore1 force-pushed the fedora_updates branch 2 times, most recently from 9530c5a to 1fafde8 Compare February 8, 2024 15:38
@Jakuje
Copy link
Collaborator

Jakuje commented Feb 8, 2024

Technically looks good to me. Again, I would wait for George to make sure this works, but I do not expect any hiccups.

One note is the linter warning that might make sense to address:

SCAutolib/models/gui.py:397:43: W292 no newline at end of file

@spoore1 spoore1 force-pushed the fedora_updates branch 2 times, most recently from 28ec510 to 78b6f4e Compare February 8, 2024 18:27
@spoore1
Copy link
Contributor Author

spoore1 commented Feb 8, 2024

Technically looks good to me. Again, I would wait for George to make sure this works, but I do not expect any hiccups.

One note is the linter warning that might make sense to address:

SCAutolib/models/gui.py:397:43: W292 no newline at end of file

@Jakuje thanks for the review.

I think I fixed the linter issue and I added the check_home_screen function. Was that in place when you approved? or do you want to take another look at that?

Copy link
Collaborator

@GeorgePantelakis GeorgePantelakis left a comment

Choose a reason for hiding this comment

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

Just some minor changes. Mostly nitpicking staff. In general, it looks good to me too.

@GeorgePantelakis
Copy link
Collaborator

I have tested the changes (+ the nitpicks) on Fedora 39 and Fedora 38 and the tests are passing. I haven't tested all the tests but the most important ones are ok. If some tweaks are needed we can do them later if necessary.

controller.py:
- dnf groups 'Server with GUI' and 'Smart Card Support' do not exist in
  Fedora.  Running dnf installs for minimal packages in these cases.
- python3-uinput is needed in newer version of Fedora instead of the
  older python-uinput used from Pypi.  Older version uses a deprecated
  sysconfig variable (SO) which is fixed in python3-uinput.
- rsyslog is needed by the tests for checking /var/log/secure.

setup.py:
- dropping python-uinput to let the controller install the appropriate
  version.

models/gui.py:
- Add check_home_screen helper function to be used in SC-tests.
@GeorgePantelakis
Copy link
Collaborator

Run the tests again and they pass on f39 and f38 with the changes (except for the lock_on_removal one which is expected after the mail discussion). I think we can merge @spoore1 if you are finished.

@GeorgePantelakis
Copy link
Collaborator

Hello @spoore1, have you done with this PR? I remember you said that you wanted to add some more code but I do not see any movement so perhaps I was mistaken.

@spoore1
Copy link
Contributor Author

spoore1 commented Mar 6, 2024

Hi @GeorgePantelakis sorry about the delay.

I was investigating using kb_send(125) to send the Super/Windows key press for a fix to some of the lock-on-removal failures after unlock. I see more issues though as I dig into the lock-on-removal tests so I think that we can call this PR done for now. I may have other changes for my SC-tests one but I think this one is done.

@GeorgePantelakis
Copy link
Collaborator

Hello @spoore1,

Since this PR is considered done and intertwined with the SC-tests PR, I will go ahead and merge both of them. There is no new code added and the old code has been tested already. Feel free to create a new PR for both projects as needed. Thank you very much for your contribution!

@GeorgePantelakis GeorgePantelakis merged commit 8cdd4ea into redhat-qe-security:master Mar 7, 2024
3 checks passed
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.

3 participants