[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v7 01/15] TestSupport: Add helper to fetch a URL on a host
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- v7: Quote $url and $path, switch to a heredoc to avoid resulting over long line v5: Support http_proxy via $c{HttpProxy} v3: Make sure wget is installed --- Osstest/Debian.pm | 2 +- Osstest/TestSupport.pm | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 537ccbe..673ceba 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -685,7 +685,7 @@ d-i apt-setup/another boolean false d-i apt-setup/non-free boolean false d-i apt-setup/contrib boolean false -d-i pkgsel/include string openssh-server, ntp, ntpdate, ethtool, chiark-utils-bin, $extra_packages +d-i pkgsel/include string openssh-server, ntp, ntpdate, ethtool, chiark-utils-bin, wget, $extra_packages $xopts{ExtraPreseed} diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index abb3195..d84ca51 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -55,7 +55,7 @@ BEGIN { target_putfilecontents_stash target_putfilecontents_root_stash target_put_guest_image target_editfile - target_editfile_cancel + target_editfile_cancel target_fetchurl target_editfile_root target_file_exists target_editfile_kvp_replace target_run_apt @@ -1589,6 +1589,16 @@ END return $cfgpath; } +sub target_fetchurl($$$;$) { + my ($ho, $url, $path, $timeo) = @_; + $timeo ||= 2000; + my $useproxy = "export http_proxy=$c{HttpProxy};" if $c{HttpProxy}; + target_cmd_root($ho, <<END, $timeo); + $useproxy wget --progress=dot:mega -O \"$path\" \"$url\" +END +} + + sub target_put_guest_image ($$;$) { my ($ho, $gho, $default) = @_; my $specimage = $r{"$gho->{Guest}_image"}; -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |