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.

Sign up for GitHub

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

Jump to bottom

Revert "Migrate the console_setup and hostname from load_extra_test to the load_create_hdd" #5431

Merged
merged 1 commit into from
Jul 19, 2018
Merged

Revert "Migrate the console_setup and hostname from load_extra_test to the load_create_hdd" #5431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/main_common.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,6 +1375,8 @@ sub load_extra_tests_desktop {
}
elsif (check_var('DISTRI', 'opensuse')) {
if (gnomestep_is_applicable()) {
# Setup env for x11 regression tests
loadtest "x11/x11_setup";
# poo#18850 java test support for firefox, run firefox before chrome
# as otherwise have wizard on first run to import settings from it
loadtest "x11/firefox/firefox_java";
Expand Down Expand Up @@ -1489,7 +1491,10 @@ sub load_extra_tests {
# pre-conditions for extra tests ie. the tests are running based on preinstalled image
return if get_var("INSTALLONLY") || get_var("DUALBOOT") || get_var("RESCUECD");

# setup $serialdev permission and so on
loadtest "console/consoletest_setup";
loadtest 'console/integration_services' if is_hyperv;
loadtest "console/hostname";
if (any_desktop_is_applicable()) {
load_extra_tests_desktop;
}
Expand Down Expand Up @@ -1806,8 +1811,6 @@ sub load_create_hdd_tests {
loadtest 'console/integration_services' if is_hyperv;
loadtest 'console/hostname' unless is_bridged_networking;
loadtest 'console/force_scheduled_tasks' unless is_jeos;
# setup $serialdev permission and so on
loadtest "console/consoletest_setup";
# Remove repos pointing to download.opensuse.org and add snaphot repo from o3
replace_opensuse_repos_tests if is_repo_replacement_required;
loadtest 'console/scc_deregistration' if get_var('SCC_DEREGISTER');
Expand Down