Commit 802a9a56 authored by Kevin Tew's avatar Kevin Tew

testsuite/testswap - cleanup

parent 4350000e
......@@ -13,7 +13,6 @@ use TestBed::TestSuite::Node;
extends 'Exporter', 'TestBed::XMLRPC::Client::Experiment';
require Exporter;
our @EXPORT;
push @EXPORT, qw(e ep launchpingkill launchpingswapkill);
sub ep { TestBed::TestSuite::Experiment->new }
......@@ -35,30 +34,20 @@ sub ping_test {
sub single_node_tests {
my ($e) = @_;
for (@{$e->nodes}) {
say $_->name;
$_->single_node_tests();
}
}
sub link_test {
sub linktest {
my ($e) = @_;
TestBed::Wrap::linktest::link_test($e->pid, $e->eid);
TestBed::Wrap::linktest::linktest($e->pid, $e->eid);
}
sub tevc {
my ($e) = shift;
my $pid = $e->pid;
my $eid = $e->eid;
TestBed::Wrap::tevc::tevc($e->pid, $e->eid, @_);
}
sub hostname_test {
my ($e) = @_;
for (@{$e->nodes}) {
$_->sshcmddump("uname -a");
}
}
sub trytest(&$) {
eval {$_[0]->()};
if ($@) {
......
......@@ -16,10 +16,6 @@ sub ping_test {
ping($self->name);
}
sub ssh_hostname_test { shift->cmdsuccess("hostname"); }
sub sudo_test { shift->cmdsuccess("sudo ls"); }
sub mounted_test { shift->cmdsuccess("mount"); }
sub single_node_tests {
my ($self) = @_;
my $ssh = $self->ssh();
......@@ -33,10 +29,4 @@ sub ssh {
my $ssh = Tools::TBSSH::ssh($self->name, $TBConfig::EMULAB_USER);
}
sub sshcmddump {
my $self = shift;
my $ssh = $self->ssh;
$ssh->cmddump(@_);
}
1;
......@@ -24,7 +24,9 @@ sub linktest {
sleep 8;
for my $i (1..4) {
sleep 2;
$ssh->cmdsuccessdump("run_linktest.pl -v -L $i -l $i -e $pid/$eid");
my $cmd = 'PATH=/usr/testbed/bin:$PATH '. "run_linktest.pl -v -L $i -l $i -e $pid/$eid";
say $cmd;
$ssh->cmdsuccessdump($cmd);
}
}
......
......@@ -46,10 +46,11 @@ if (@ARGV) {
elsif (/swapin/) { $e->swapin_wait; }
elsif (/swapout/) { $e->swapout_wait; }
elsif (/start/) { $e->startexp_ns_wait($ns); }
elsif (/ni/) { say Dumper($e->nodeinfo) ;}
elsif (/li/) { say Dumper($e->linkinfo) ;}
elsif (/tevc/) { $e->tevc(@ARGV); }
elsif (/linktest/) { $e->linktest; }
elsif (/single_node_tests/) { $e->single_node_tests; }
elsif (/ni/) { say Dumper($e->nodeinfo) ;}
elsif (/li/) { say Dumper($e->linkinfo) ;}
else {
}
}
......
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