April 2022 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/TestAgent: Simplify the implementation for commands with no argument.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: tools Branch: master Commit: c923c74ac05d42d8f18e484be337a93164f42ded URL: https://source.winehq.org/git/tools.git/?a=commit;h=c923c74ac05d42d8f18e484… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 17:09:18 2022 +0200 testbot/TestAgent: Simplify the implementation for commands with no argument. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 10bdc63..8691f47 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -210,15 +210,7 @@ while (@ARGV) @Rm = @ARGV; last; } - elsif ($arg eq "getcwd") - { - $Cmd = $arg; - } - elsif ($arg eq "getversion") - { - set_cmd($arg); - } - elsif ($arg eq "ping" or $arg eq "settime") + elsif ($arg =~ /^(?:getcwd|getversion|ping|settime)$/) { set_cmd($arg); }

1 0

Francois Gouget : testbot/TestAgent: Update and fix the usage message.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: tools Branch: master Commit: ec9faa846c8a6525f67b546a60c4bcdce54ad5d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ec9faa846c8a6525f67b546… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 17:10:06 2022 +0200 testbot/TestAgent: Update and fix the usage message. The upgrade and restart commands were each only half documented. The getversion command was misspelled. Better identify optional arguments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 8691f47..a3d6e26 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -315,15 +315,17 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n"; - print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; - print "or $name0 [options] <hostname> run <command> <arguments>\n"; + print "Usage: $name0 [options] <hostname> sendfile <localpath> [<serverpath>]\n"; + print "or $name0 [options] <hostname> getfile <serverpath> [<localpath>]\n"; + print "or $name0 [options] <hostname> run <command> [<arguments>]\n"; print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; - print "or $name0 [options] <hostname> getproperty <name>\n"; + print "or $name0 [options] <hostname> getproperty [<name>]\n"; print "or $name0 [options] <hostname> setproperty <name> <value>\n"; - print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; + print "or $name0 [options] <hostname> (getcwd|ping|getversion)\n"; + print "or $name0 [options] <hostname> upgrade <localexe>\n"; + print "or $name0 [options] <hostname> restart <serverexe> [<arg1>...]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; print "\n"; @@ -345,18 +347,21 @@ if (defined $Usage) print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " wait Waits for the specified child process on the server.\n"; print " settime Set the system time of the remote host.\n"; + print " getcwd Returns the server's current working directory.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the protocol version.\n"; - print " getproperty <name> Retrieves and prints the specified server property, for\n"; + print " getproperty Retrieves and prints the <name> server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; - print " setproperty <name> <value> Sets the specified property.\n"; - print " getcwd Returns the server's current working directory.\n"; + print " setproperty Sets the <name> property to <value>.\n"; print " ping Makes sure the server is still alive.\n"; - print " upgrade Replaces the server executable with the specified file and\n"; - print " restarts it.\n"; - print " restart Replaces and restarts the server from the specified server file\n"; - print " and arguments or from the last command line if omitted.\n"; + print " upgrade Replaces the server executable with the <localexe> local file\n"; + print " and restarts it.\n"; + print " restart The first argument is mandatory and identifies the server file\n"; + print " the server executable should be replaced with. The arguments\n"; + print " that follow, if any, are passed to the server when it is\n"; + print " restarted. If omitted the current server's arguments are used\n"; + print " instead.\n"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-one-timeout <time> Specifies the timeout for one connection\n";

1 0

Francois Gouget : testbot/cgi: Document CollectionBlock::new().
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: tools Branch: master Commit: ff279c46c3a9ea9ce16f8b01b661e894e4f3597b URL: https://source.winehq.org/git/tools.git/?a=commit;h=ff279c46c3a9ea9ce16f8b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 17:10:26 2022 +0200 testbot/cgi: Document CollectionBlock::new(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 200734a..cbe22f9 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -74,6 +74,28 @@ use POSIX qw(strftime); use URI::Escape; +=pod +=over 12 + +=item C<new()> + +Creates a table showing the content of the specified Collection with +support for performing actions on selected rows, or performing global actions. + +Parameters: +=over +=Collection +The collection of objects to show in the table. + +=item EnclosingPage +The page the table will be inserted in. This page object must implement the +ObjectModel::CGI::Page interface. + +=back + +=back +=cut + sub new($$$@) { my $class = shift;

1 0

Francois Gouget : testbot/web: Use SimpleCollectionPage for the branches page.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: tools Branch: master Commit: eef76aa218e60a0400dde666741d38f5a35f425d URL: https://source.winehq.org/git/tools.git/?a=commit;h=eef76aa218e60a0400dde66… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 17:10:34 2022 +0200 testbot/web: Use SimpleCollectionPage for the branches page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/BranchesList.pl | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index a325818..0370237 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -2,6 +2,7 @@ # Branch list page # # Copyright 2009 Ge van Geldorp +# Copyright 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,33 +20,11 @@ use strict; -package BranchesListPage; - -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); +package main; +use ObjectModel::CGI::SimpleCollectionPage; use WineTestBot::Branches; - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - - $self->SUPER::_initialize($Request, $RequiredRole, CreateBranches()); -} - -sub SortKeys($$$) -{ - my ($self, $CollectionBlock, $Keys) = @_; - - my @SortedKeys = sort { $a cmp $b } @$Keys; - return \@SortedKeys; -} - - -package main; - my $Request = shift; - -my $BranchesListPage = BranchesListPage->new($Request, "admin"); -$BranchesListPage->GeneratePage(); +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateBranches()); +$Page->GeneratePage();

1 0