create_webfile needs a pathname in the shared public-html directory.
These paths need to be (a) stable (b) unique across all running jobs.
We achieve this by basing the filenames on the hostname and (for a
guest) the guest name.
But for an L2 guest we need to include the physical host name too,
because the L1 `host' is not unique.
Fix this by using hostnamepath(), replacing the open-coded single
iteration.
Reported-by: Ian Campbell <ian.campb...@citrix.com>
CC: Robert Ho <robert...@intel.com>
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
Osstest/TestSupport.pm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 47b3e6f..a66f8a9 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -2262,9 +2262,7 @@ sub await_webspace_fetch_byleaf ($$$$$) {
sub create_webfile ($$$) {
my ($ho, $tail, $contents) = @_; # $contents as for file_link_contents
- my $wf_rhs= $ho->{Name}."_".$tail;
- # $ho->{Host} is set if $ho is a guest.
- $wf_rhs= $ho->{Host}{Name}."_${wf_rhs}" if $ho->{Host};
+ my $wf_rhs= hostnamepath($ho)."_".$tail;
my $wf_common= $c{WebspaceCommon}.$wf_rhs;
my $wf_url= $c{WebspaceUrl}.$wf_common;
my $wf_file= $c{WebspaceFile}.$wf_common;
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
