srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-22 05:53:09 +00:00
Code Issues Releases Activity

handle REPOSITORY_GRAPHICAL being http as well as https

Browse Source 
I assumed the 'compose location' sent by fedmsg was https, but
in fact it's http (you get redirected to https when you access
it). Could just change the default back to 4, but why not make
it properly robust. Sending without review so this doesn't go
wrong all weekend.
This commit is contained in:
Adam Williamson 2016-09-02 08:51:36 -07:00
parent 315295c4b9
commit 82b8b0a053
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/install_source_graphical.pm
View File

@ -13,17 +13,22 @@ sub run {
# select appropriate protocol on the network # select appropriate protocol on the network
assert_and_click "anaconda_install_source_on_the_network"; assert_and_click "anaconda_install_source_on_the_network";
send_key "tab"; send_key "tab";
# if we have an NFS repo select NFS (one 'up'), otherwise HTTPS (three 'ups') # select appropriate repo type for the URL by pressing 'up' a given
my $num; # number of times. default - 3 - is https
$num = get_var("REPOSITORY_GRAPHICAL") =~ m/^nfs:/ ? 1 : 3; my $num = 3;
for (my $i=0; $i<$num; $i++){ if (get_var("REPOSITORY_GRAPHICAL") =~ m/^nfs:/) {
$num = 1;
}
if (get_var("REPOSITORY_GRAPHICAL") =~ m/^http:/) {
$num = 4;
}
for (my $i=0; $i<$num; $i++) {
send_key "up"; send_key "up";
} }
# let's just accept either NFS or HTTP here, if it's the wrong one the # we accept any of the protocol needles here, if we happened to
# test will fail soon anyhow # choose wrong the test will fail soon anyhow
assert_screen "anaconda_install_source_selected"; assert_screen "anaconda_install_source_selected";
# insert the url # insert the url
send_key "tab"; send_key "tab";
my $repourl = ""; my $repourl = "";