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

Add test condition to remove libmicrohttpd test scenario in SLE15 #6435

Merged
merged 1 commit into from Dec 24, 2018

Conversation

jouyingbin
Copy link
Contributor

@jouyingbin jouyingbin commented Dec 21, 2018

Add test condition to remove libmicrohttpd test scenario in SLE15

The test was dropped from SLE15 but it will be still tested in SLE12-SPx
Related bsc#1087409

@@ -1979,8 +1979,8 @@ sub load_security_tests_web {
loadtest "console/wget_https";
loadtest "console/w3m_https";
loadtest "console/apache_ssl";
if (check_var('DISTRI', 'sle') && get_var('FIPS_ENABLED')) {
loadtest "fips/mozilla_nss/apache_nssfips";
loadtest "fips/mozilla_nss/apache_nssfips";
Copy link
Contributor

Choose a reason for hiding this comment

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

apache_nssfips only works under fips mode

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry my fault, How about changing like this simply

if (check_var('DISTRI', 'sle') && get_var('FIPS_ENABLED')) {
   loadtest "fips/mozilla_nss/apache_nssfips";
}
if (is_sle('<15') && get_var('FIPS_ENABLED')) {
    loadtest "console/libmicrohttpd";
}

Copy link
Contributor

Choose a reason for hiding this comment

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

how about this

    if (check_var('DISTRI', 'sle') && get_var('FIPS_ENABLED')) {
        loadtest "fips/mozilla_nss/apache_nssfips";
        loadtest "console/libmicrohttpd" if is_sle('<15');
    }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mitiao Thanks for your suggestions,

I am just modifying a test like this , and I think your way is better 👍

@mitiao mitiao merged commit aed1799 into os-autoinst:master Dec 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants