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 driverdisk-disk test #35

Merged

Conversation

jkonecny12
Copy link
Member

Driver disk .ko file was generated to folder /usr/lib/modules/3.0.0/extra/ but test pointed to location /lib/modules/uname -r/updates/.

Fix location in test.

@@ -26,7 +26,7 @@ RESULTFILE=$SYSROOT/root/RESULT
fail() { echo "*** $*" >> $RESULTFILE; }

# check the installer environment
[ -f /lib/modules/`uname -r`/updates/fake-dd.ko ] || fail "kmod not loaded"
[ -f /usr/lib/modules/3.0.0/extra/fake-dd.ko ] || fail "kmod not loaded"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the folder really fixed or is the above path just now?

Copy link
Member Author

Choose a reason for hiding this comment

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

This folder is created by the RPM with driver disk. The RPM is created by the script in lib/mkdud.py and there is 3.0.0 as kernel version if version is not set. Because the tests are run on boot.iso, we don't know which kernel version is there in time of the script execution.

This can be improved by grabbing logs from Lorax when building this iso or by running the boot.iso in some pre-testing phase but I don't think it's so much valuable for us now. But it could be a nice improvement for the tests in future.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds good to me.

@vpodzime vpodzime added the ACK label Aug 29, 2016
@wgwoods
Copy link

wgwoods commented Aug 31, 2016

Looks good to me! In fact, I'd suggest that you add your above comments about why the version is 3.0.0 instead of what we might expect (and how we could improve this for tests in the future) to the commit message (and/or in a comment in the code). And thanks for explaining that!

Driver disk .ko file was generated to folder
/usr/lib/modules/3.0.0/extra/ but test pointed to location
/lib/modules/`uname -r`/updates/.

Fix location in test.

Explanation:
Module version folder is created by the RPM with driver disk. The RPM
is created by the script in lib/mkdud.py. The kernel version is 3.0.0
if version parameter is not explicitly set. Because the tests are run
on a boot.iso, we don't know which kernel version is there in time of
the script execution.
TODO: This can be improved by grabbing logs from Lorax when building
this iso or by running the boot.iso in some pre-testing phase.
@jkonecny12
Copy link
Member Author

Updated with added explanation. Thank you will for pointing this out.

@jkonecny12 jkonecny12 merged commit 8285b9b into rhinstaller:master Sep 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants