October 2012 - Wine-commits

Francois Gouget : testbot/VMs: Remove some redundant VM log messages.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: tools Branch: master Commit: 8b7730c8c5a7757c0890483cb366d095b1704e3e URL: http://source.winehq.org/git/tools.git/?a=commit;h=8b7730c8c5a7757c0890483c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 24 12:15:33 2012 +0200 testbot/VMs: Remove some redundant VM log messages. The general principle is that traces should be generated by the tools, not by the Perl modules. --- testbot/bin/Engine.pl | 2 +- testbot/bin/RevertVM.pl | 7 ++++--- testbot/lib/WineTestBot/VMs.pm | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index d504a50..f453927 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -433,7 +433,7 @@ sub HandleGetScreenshot my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); if (defined($ErrMessage)) { - LogMsg "Screenshot failed: $ErrMessage\n"; + LogMsg "Failed to take screenshot of $VMName: $ErrMessage\n"; return "0$ErrMessage"; } diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index d7b262e..fbf479f 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -71,8 +71,6 @@ if (! $VMKey) die "Usage: RevertVM.pl VMName"; } -LogMsg "Revert of $VMKey started\n"; - my $VMs = CreateVMs(); my $VM = $VMs->GetItem($VMKey); if (! defined($VM)) @@ -80,6 +78,7 @@ if (! defined($VM)) FatalError "VM $VMKey doesn't exist"; } +LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; $VM->Status("reverting"); my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -103,7 +102,8 @@ if (defined($ErrMessage)) foreach my $WaitCount (1..3) { - $ErrMessage = $VM->WaitForToolsInGuest(); + LogMsg "Waiting for ", $VM->Name, " (up to ${WaitForToolsInVM}s)\n"; + $ErrMessage = $VM->WaitForToolsInGuest($WaitForToolsInVM); if (! defined($ErrMessage)) { last; @@ -116,6 +116,7 @@ if (defined($ErrMessage)) if ($SleepAfterRevert != 0) { + LogMsg "Letting ", $VM->Name, " settle for ${SleepAfterRevert}s\n"; sleep($SleepAfterRevert); } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2b4786e..6dc8b8a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -195,7 +195,6 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::TestAgent; use WineTestBot::WineTestBotObjects; -use WineTestBot::Log; use vars qw (@ISA @EXPORT); @@ -284,7 +283,6 @@ sub _GetSnapshot($$) sub RevertToSnapshot($$) { my ($self, $SnapshotName) = @_; - LogMsg("Reverting ", $self->VirtDomain, " to $SnapshotName\n"); my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); return $ErrMessage if (defined $ErrMessage); @@ -351,7 +349,6 @@ sub WaitForToolsInGuest($;$) my ($self, $Timeout) = @_; $Timeout ||= $WaitForToolsInVM; - LogMsg("Waiting for ", $self->Name, " (up to ${Timeout}s)\n"); my ($Status, $Err) = TestAgent::GetStatus($self->Hostname, $Timeout); # In fact we don't care about the status return $Err; @@ -389,7 +386,6 @@ sub _Stream2Image($$$) sub CaptureScreenImage($) { my ($self) = @_; - LogMsg("CaptureScreenImage ", $self->Name, "\n"); my ($ErrMessage, $Domain) = $self->_GetDomain(); return ($ErrMessage, undef, undef) if (defined $ErrMessage);

1 0

Francois Gouget : testbot/VMs: Always let the caller specify the WaitForToolsInGuest() timeout.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: tools Branch: master Commit: f6608b629242d1d146d65c2a7a38f0fa918ad0e7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6608b629242d1d146d65c2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 24 12:15:48 2012 +0200 testbot/VMs: Always let the caller specify the WaitForToolsInGuest() timeout. There is only one caller and it already knows the timeout. --- testbot/lib/WineTestBot/VMs.pm | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6dc8b8a..a356e98 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,11 +344,10 @@ sub PowerOff return $self->UpdateStatus($Domain); } -sub WaitForToolsInGuest($;$) +sub WaitForToolsInGuest($$) { my ($self, $Timeout) = @_; - $Timeout ||= $WaitForToolsInVM; my ($Status, $Err) = TestAgent::GetStatus($self->Hostname, $Timeout); # In fact we don't care about the status return $Err;

1 0

Francois Gouget : testbot/RevertVM: Mark a VM as offline if WaitForToolsInGuest() fails.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: tools Branch: master Commit: f6578425933ae77ec2b7014ac3380be628a170e8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6578425933ae77ec2b7014a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 24 12:16:10 2012 +0200 testbot/RevertVM: Mark a VM as offline if WaitForToolsInGuest() fails. If the tools (i.e. testagentd) don't respond, we will be unable to start tasks on that VM anyway. --- testbot/bin/RevertVM.pl | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index fbf479f..743760f 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -104,14 +104,11 @@ foreach my $WaitCount (1..3) { LogMsg "Waiting for ", $VM->Name, " (up to ${WaitForToolsInVM}s)\n"; $ErrMessage = $VM->WaitForToolsInGuest($WaitForToolsInVM); - if (! defined($ErrMessage)) - { - last; - } + last if (!defined $ErrMessage); } -if (defined($ErrMessage)) +if (defined $ErrMessage) { - LogMsg "$VMKey Error while waiting for tools: $ErrMessage\n"; + FatalError "Tools in $VMKey not responding: $ErrMessage", $VM; } if ($SleepAfterRevert != 0)

1 0

Francois Gouget : testbot/RevertVM: Only send an email if the VM has been marked as offline.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: tools Branch: master Commit: 1f9f5654928f20791b023ecf75a0f3d71b2724a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f9f5654928f20791b023ecf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 24 12:16:42 2012 +0200 testbot/RevertVM: Only send an email if the VM has been marked as offline. --- testbot/bin/RevertVM.pl | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 743760f..ee46218 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -39,25 +39,29 @@ sub FatalError { my ($ErrMessage, $VM) = @_; - my $VMKey = defined($VM) ? $VM->GetKey() : ""; - LogMsg $ErrMessage, "\n"; if ($VM) { $VM->Status("offline"); $VM->Save(); - } - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + my $VMKey = $VM->GetKey(); + my $VMSnapshot = $VM->IdleSnapshot; + open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + print SENDMAIL <<"EOF"; From: <$RobotEMail> (Marvin) To: $AdminEMail Subject: VM $VMKey offline -Reverting $VMKey resulted in error "$ErrMessage". The VM has been put offline. +Reverting $VMKey to $VMSnapshot failed: + +$ErrMessage + +The VM has been put offline. EOF - close(SENDMAIL); + close(SENDMAIL); + } exit 1; }

1 0

Francois Gouget : testbot/VMs: Cleanly separate the VM type and role, and clean up support for retired VMs.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: tools Branch: master Commit: dc029b50cfbe715b28475ec47dbe1dbbfdfb69cc URL: http://source.winehq.org/git/tools.git/?a=commit;h=dc029b50cfbe715b28475ec4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 23 18:53:41 2012 +0200 testbot/VMs: Cleanly separate the VM type and role, and clean up support for retired VMs. --- testbot/bin/CheckForWinetestUpdate.pl | 57 ++++++------- testbot/bin/WineRunTask.pl | 12 +-- testbot/ddl/update16.sql | 43 +++++++++ testbot/ddl/winetestbot.sql | 4 +- testbot/doc/winetestbot-schema.dia | 10 +- testbot/lib/WineTestBot/Config.pm | 6 +- testbot/lib/WineTestBot/Jobs.pm | 36 ++++---- testbot/lib/WineTestBot/Patches.pm | 69 ++++++--------- testbot/lib/WineTestBot/VMs.pm | 74 ++++++++++++---- testbot/web/Submit.pl | 154 +++++++++++++++++---------------- testbot/web/admin/VMsList.pl | 5 +- testbot/web/index.pl | 2 +- 12 files changed, 266 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=dc029b50cfbe715b2847…

1 0

Francois Gouget : testbot: The VM's Interactive flag is unused so remove it .
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: tools Branch: master Commit: 45168133dfc7a1eda233569582097cf1a4e1b5e2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=45168133dfc7a1eda2335695… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 23 18:58:00 2012 +0200 testbot: The VM's Interactive flag is unused so remove it. --- testbot/ddl/update17.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 24 ++---------------------- testbot/lib/WineTestBot/VMs.pm | 1 - 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/testbot/ddl/update17.sql b/testbot/ddl/update17.sql new file mode 100644 index 0000000..9789685 --- /dev/null +++ b/testbot/ddl/update17.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE VMs + DROP Interactive; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index daa0ed6..b0a4f02 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -53,7 +53,6 @@ CREATE TABLE VMs VirtDomain VARCHAR(32) NOT NULL, IdleSnapshot VARCHAR(32) NOT NULL, Hostname VARCHAR(64) NOT NULL, - Interactive ENUM('Y', 'N') NOT NULL, Description VARCHAR(40) NULL, PRIMARY KEY (Name) ) diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 043c1af..b8ae1a9 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2088,7 +2088,7 @@ <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.6708,-2.02919;35.8258,8.17081"/> + <dia:rectangle val="25.6708,-2.02919;35.8258,7.37081"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2100,7 +2100,7 @@ <dia:real val="10.155000000000001"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="10.199999999999999"/> + <dia:real val="9.3999999999999986"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -2333,26 +2333,6 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> - <dia:string>#Interactive#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> <dia:string>#Description#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 84d3fe8..45ff555 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -538,7 +538,6 @@ BEGIN CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32), CreateBasicPropertyDescriptor("Hostname", "The VM hostname", !1, 1, "A", 64), - CreateBasicPropertyDescriptor("Interactive", "Needs interactive flag", !1, 1, "B", 1), CreateBasicPropertyDescriptor("Description", "Description", !1, !1, "A", 40), ); }

1 0

Francois Gouget : testbot/VMs: Fix the VM deletion.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: tools Branch: master Commit: 3da43ab5d8e49989bd60b178199337a59b8f22af URL: http://source.winehq.org/git/tools.git/?a=commit;h=3da43ab5d8e49989bd60b178… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 23 18:58:40 2012 +0200 testbot/VMs: Fix the VM deletion. VMs cannot be deleted directly because the Tasks hold references to them. So mark VMs as deleted and let the Janitor.pl script delete them when no Task references them anymore. --- testbot/bin/Janitor.pl | 45 ++++++++++++++++++++++++++++++++++++++++ testbot/ddl/update18.sql | 4 +++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/VMs.pm | 14 +++++++++-- testbot/web/Submit.pl | 2 +- testbot/web/admin/VMsList.pl | 15 +++++++++++++ 6 files changed, 77 insertions(+), 5 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 033bd5d..5f3a992 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -34,10 +34,13 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; use WineTestBot::PendingPatchSets; +use WineTestBot::VMs; + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; +# Delete obsolete Jobs if ($WineTestBot::Config::JobPurgeDays != 0) { my $DeleteBefore = time() - $WineTestBot::Config::JobPurgeDays * 86400; @@ -59,6 +62,7 @@ if ($WineTestBot::Config::JobPurgeDays != 0) $Jobs = undef; } +# Delete PatchSets that are more than a day old my $DeleteBefore = time() - 1 * 86400; my $Sets = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); foreach my $SetKey (@{$Sets->GetKeys()}) @@ -85,6 +89,7 @@ foreach my $SetKey (@{$Sets->GetKeys()}) } } +# Delete obsolete Patches now that no Job references them if ($WineTestBot::Config::JobPurgeDays != 0) { $DeleteBefore = time() - $WineTestBot::Config::JobPurgeDays * 86400; @@ -111,6 +116,7 @@ if ($WineTestBot::Config::JobPurgeDays != 0) $Patches = undef; } +# Archive old Jobs, that is remove all their associated files if ($WineTestBot::Config::JobArchiveDays != 0) { my $ArchiveBefore = time() - $WineTestBot::Config::JobArchiveDays * 86400; @@ -137,3 +143,42 @@ if ($WineTestBot::Config::JobArchiveDays != 0) } $Jobs = undef; } + +# Purge deleted VMs if they are not referenced anymore +my $VMs = CreateVMs(); +$VMs->AddFilter("Role", ["deleted"]); +my %DeleteList; +map { $DeleteList{$_} = 1 } @{$VMs->GetKeys()}; + +if (%DeleteList) +{ + my $Jobs = CreateJobs(); + foreach my $JobKey (@{$Jobs->GetKeys()}) + { + my $Job = $Jobs->GetItem($JobKey); + my $Steps = $Job->Steps; + foreach my $StepKey (@{$Steps->GetKeys()}) + { + my $Step = $Steps->GetItem($StepKey); + my $Tasks = $Step->Tasks; + foreach my $TaskKey (@{$Tasks->GetKeys()}) + { + my $Task = $Tasks->GetItem($TaskKey); + if (exists $DeleteList{$Task->VM->Name}) + { + LogMsg "Janitor: keeping the ", $Task->VM->Name, " VM for task (", join(":", $JobKey, $StepKey, $TaskKey), ")\n"; + delete $DeleteList{$Task->VM->Name}; + } + } + } + } + foreach my $VMKey (keys %DeleteList) + { + my $VM = $VMs->GetItem($VMKey); + my $ErrMessage = $VMs->DeleteItem($VM); + if (!defined $ErrMessage) + { + LogMsg "Janitor: deleted the ", $VM->Name, " VM\n"; + } + } +} diff --git a/testbot/ddl/update18.sql b/testbot/ddl/update18.sql new file mode 100644 index 0000000..9299d61 --- /dev/null +++ b/testbot/ddl/update18.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE VMs + MODIFY Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index b0a4f02..75e3318 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -47,7 +47,7 @@ CREATE TABLE VMs Name VARCHAR(20) NOT NULL, SortOrder INT(3) NOT NULL, Type ENUM('win32', 'win64', 'build') NOT NULL, - Role ENUM('extra', 'base', 'winetest', 'retired') NOT NULL, + Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline') NOT NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 45ff555..2b4786e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -532,7 +532,7 @@ BEGIN CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), - CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired']), + CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline']), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), @@ -609,10 +609,18 @@ sub SortKeysBySortOrder my %SortOrder; foreach my $Key (@$Keys) { - $SortOrder{$Key} = $self->GetItem($Key)->SortOrder; + my $Item = $self->GetItem($Key); + $SortOrder{$Key} = [$Item->Role, $Item->SortOrder]; } - my @SortedKeys = sort { $SortOrder{$a} <=> $SortOrder{$b} } @$Keys; + my @SortedKeys = sort { + my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); + # Sort deleted VMs last + return 1 if (@$soa[0] eq "deleted"); + return -1 if (@$sob[0] eq "deleted"); + # Otherwise follow the SortOrder key + return @$soa[1] <=> @$sob[1]; + } @$Keys; return \@SortedKeys; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 7d44903..d8b222d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -242,7 +242,7 @@ sub GenerateFields $VMs->AddFilter("Status", ["reverting", "sleeping", "idle", "running", "dirty"]); if ($self->{ShowAll}) { - # All but the retired ones + # All but the retired and deleted ones $VMs->AddFilter("Role", ["base", "winetest", "extra"]); } else diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index c148582..0e6d133 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -54,6 +54,21 @@ sub SortKeys return $self->{Collection}->SortKeysBySortOrder($Keys); } +sub OnItemAction +{ + my $self = shift; + my ($CollectionBlock, $Item, $Action) = @_; + + if ($Action eq "Delete") + { + $Item->Role("deleted"); + my ($ErrKey, $ErrProperty, $ErrMessage) = $self->{Collection}->Save(); + return ! defined($ErrMessage); + } + + return $self->SUPER::OnItemAction(@_); +} + package main; my $Request = shift;

1 0

Francois Gouget : testbot/WineRunTask: Treat a missing test summary line as an error.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: tools Branch: master Commit: e595de2a5f3d7b486839e159d982effcdae15059 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e595de2a5f3d7b486839e159… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 23 18:23:43 2012 +0200 testbot/WineRunTask: Treat a missing test summary line as an error. --- testbot/bin/WineRunTask.pl | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 6f63640..ca72fc7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -335,11 +335,7 @@ $Task->Status("completed"); $Task->ChildPid(undef); $Task->Ended(time); my $TestFailures = CountFailures($FullLogFileName); -if (defined($TestFailures)) -{ - $Task->TestFailures($TestFailures); -} -else +if (!defined $TestFailures) { my $OldUMask = umask(002); if (open ERRFILE, ">>$FullErrFileName") @@ -348,7 +344,9 @@ else close ERRFILE; } umask($OldUMask); + $TestFailures = 1; } +$Task->TestFailures($TestFailures); $Task->Save(); $Job->UpdateStatus(); if ($Task->VM->Role ne "base")

1 0

Jacek Caban : mshtml: Added IHTMLIFrameElement:: height property implementation.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: a741a3f99c8835daf59501d55ae09beb26ef9360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a741a3f99c8835daf59501d55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 13:41:33 2012 +0200 mshtml: Added IHTMLIFrameElement::height property implementation. --- dlls/mshtml/htmliframe.c | 33 +++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 0e7b218..c1f1264 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -217,15 +217,40 @@ static HRESULT WINAPI HTMLIFrameElement2_Invoke(IHTMLIFrameElement2 *iface, DISP static HRESULT WINAPI HTMLIFrameElement2_put_height(IHTMLIFrameElement2 *iface, VARIANT v) { HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("Unsupported %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + nsres = nsIDOMHTMLIFrameElement_SetHeight(This->framebase.nsiframe, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetHeight failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLIFrameElement2_get_height(IHTMLIFrameElement2 *iface, VARIANT *p) { HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLIFrameElement_GetHeight(This->framebase.nsiframe, &nsstr); + + V_VT(p) = VT_BSTR; + return return_nsstr(nsres, &nsstr, &V_BSTR(p)); } static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ef036da..3c1b0e2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -878,6 +878,17 @@ static IHTMLLinkElement *_get_link_iface(unsigned line, IUnknown *unk) return ret; } +#define get_iframe2_iface(u) _get_iframe2_iface(__LINE__,u) +static IHTMLIFrameElement2 *_get_iframe2_iface(unsigned line, IUnknown *unk) +{ + IHTMLIFrameElement2 *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLIFrameElement2, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLIFrameElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5239,6 +5250,39 @@ static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) IHTMLDocument2_Release(window_doc); } +#define test_iframe_height(a,b) _test_iframe_height(__LINE__,a,b) +static void _test_iframe_height(unsigned line, IHTMLElement *elem, const char *exval) +{ + IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); + VARIANT v; + HRESULT hres; + + hres = IHTMLIFrameElement2_get_height(iframe, &v); + ok_(__FILE__,line)(hres == S_OK, "get_height failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exval), "height = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exval); + else + ok_(__FILE__,line)(!V_BSTR(&v), "height = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLIFrameElement2_Release(iframe); +} + +#define set_iframe_height(a,b) _set_iframe_height(__LINE__,a,b) +static void _set_iframe_height(unsigned line, IHTMLElement *elem, const char *val) +{ + IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr(val); + hres = IHTMLIFrameElement2_put_height(iframe, v); + ok_(__FILE__,line)(hres == S_OK, "put_height failed: %08x\n", hres); + VariantClear(&v); + IHTMLIFrameElement2_Release(iframe); +} + static void test_iframe_elem(IHTMLElement *elem) { IHTMLDocument2 *content_doc, *owner_doc; @@ -5281,6 +5325,11 @@ static void test_iframe_elem(IHTMLElement *elem) win_skip("IHTMLIFrameElement3 not supported\n"); } + test_iframe_height(elem, NULL); + set_iframe_height(elem, "100px"); + set_iframe_height(elem, "50%"); + test_iframe_height(elem, "50%"); + str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; disp = NULL;

1 0

Jacek Caban : mshtml: Added IHTMLIFrameElement:: width property implementation.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: d27417768e70637b94c951bb911df780930f8f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27417768e70637b94c951bb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 13:41:51 2012 +0200 mshtml: Added IHTMLIFrameElement::width property implementation. --- dlls/mshtml/htmliframe.c | 33 +++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index c1f1264..64f44fd 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -256,15 +256,40 @@ static HRESULT WINAPI HTMLIFrameElement2_get_height(IHTMLIFrameElement2 *iface, static HRESULT WINAPI HTMLIFrameElement2_put_width(IHTMLIFrameElement2 *iface, VARIANT v) { HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) { + FIXME("Unsupported %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + nsres = nsIDOMHTMLIFrameElement_SetWidth(This->framebase.nsiframe, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetWidth failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLIFrameElement2_get_width(IHTMLIFrameElement2 *iface, VARIANT *p) { HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLIFrameElement_GetWidth(This->framebase.nsiframe, &nsstr); + + V_VT(p) = VT_BSTR; + return return_nsstr(nsres, &nsstr, &V_BSTR(p)); } static const IHTMLIFrameElement2Vtbl HTMLIFrameElement2Vtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3c1b0e2..20e9e4c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5283,6 +5283,39 @@ static void _set_iframe_height(unsigned line, IHTMLElement *elem, const char *va IHTMLIFrameElement2_Release(iframe); } +#define test_iframe_width(a,b) _test_iframe_width(__LINE__,a,b) +static void _test_iframe_width(unsigned line, IHTMLElement *elem, const char *exval) +{ + IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); + VARIANT v; + HRESULT hres; + + hres = IHTMLIFrameElement2_get_width(iframe, &v); + ok_(__FILE__,line)(hres == S_OK, "get_width failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exval), "width = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exval); + else + ok_(__FILE__,line)(!V_BSTR(&v), "width = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLIFrameElement2_Release(iframe); +} + +#define set_iframe_width(a,b) _set_iframe_width(__LINE__,a,b) +static void _set_iframe_width(unsigned line, IHTMLElement *elem, const char *val) +{ + IHTMLIFrameElement2 *iframe = _get_iframe2_iface(line, (IUnknown*)elem); + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr(val); + hres = IHTMLIFrameElement2_put_width(iframe, v); + ok_(__FILE__,line)(hres == S_OK, "put_width failed: %08x\n", hres); + VariantClear(&v); + IHTMLIFrameElement2_Release(iframe); +} + static void test_iframe_elem(IHTMLElement *elem) { IHTMLDocument2 *content_doc, *owner_doc; @@ -5330,6 +5363,11 @@ static void test_iframe_elem(IHTMLElement *elem) set_iframe_height(elem, "50%"); test_iframe_height(elem, "50%"); + test_iframe_width(elem, NULL); + set_iframe_width(elem, "150px"); + set_iframe_width(elem, "70%"); + test_iframe_width(elem, "70%"); + str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; disp = NULL;

1 0