Commit d0104423 authored by Kevin Tew's avatar Kevin Tew

testsuite/testswap bug fix

parent c7504236
......@@ -7,8 +7,8 @@ use TestBed::XMLRPC::Client::NodeInfo;
extends 'TestBed::XMLRPC::Client';
has 'pid' => ( isa => 'Str', is => 'rw');
has 'gid' => ( isa => 'Str', is => 'rw');
has 'pid' => ( isa => 'Str', is => 'rw', default => sub { $TBConfig::DEFAULT_PID; } );
has 'gid' => ( isa => 'Str', is => 'rw', default => sub { $TBConfig::DEFAULT_GID || $TBConfig::DEFAULT_PID; } );
has 'eid' => ( isa => 'Str', is => 'rw', default => \&gen_random_eid);
#autoloaded/autogenerated/method_missings/etc batchexp swapexp endexp waitforactive getlist expinfo metadata modify
......@@ -23,13 +23,11 @@ sub gen_random_eid {
sub args {
my $self = shift;
my $pid = $self->pid || $TBConfig::DEFAULT_PID;
my $gid = $self->gid || $TBConfig::DEFAULT_GID || $TBConfig::DEFAULT_PID;
my $eid = $self->eid || $self->gen_random_eid;
my $args = { 'pid' => $pid, 'eid' => $eid };
$args->{'gid'} = $gid if $gid;
return { %$args, @_ };
my $pid = $self->pid;
my $gid = $self->gid;
my $eid = $self->eid;
return { 'pid' => $pid, 'gid' => $gid, 'eid' => $eid, @_ };
}
sub echo { shift->augment_output( 'str' => shift ); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment