Commit cf628e44 authored by Leigh Stoller's avatar Leigh Stoller

A bunch of little fixes; number of failing tests is down to three.

parent 4dcbb476
......@@ -78,8 +78,9 @@ sub tb_prerun {
# system("mysqldump --all $db > $cmd-$::counter.txt");
$::counter++;
if ($ecode != $exitcode) {
tb_fail("$cmd - Exit code $ecode, expected $exitcode");
# Forget about specific error codes. Either success or fail.
if (($exitcode && !$ecode) || (!$exitcode && $ecode)) {
tb_fail("$cmd - Exit code $ecode. Unexpected");
}
};
sub tb_compare {
......@@ -121,8 +122,9 @@ sub tb_run {
# system("mysqldump --all $db > $cmd-$::counter.txt");
$::counter++;
if ($ecode != $exitcode) {
tb_fail("$cmd - Exit code $ecode, expected $exitcode");
# Forget about specific error codes. Either success or fail.
if (($exitcode && !$ecode) || (!$exitcode && $ecode)) {
tb_fail("$cmd - Exit code $ecode. Unexpected");
}
};
sub tb_fail {
......
......@@ -5,7 +5,7 @@
# be sure to go and update configure.in.
#
WWWDEFS=default
IPBASE=192.168
IPBASE=10
DELAYCAPACITY=2
DISABLE_NAMED_SETUP=1
DISABLE_EVENT_SCHED=1
......@@ -21,12 +21,12 @@ tb_compare("SELECT vname,delay,bandwidth,lossrate,member from virt_lans" .
"order by vname,member",
\@result);
@result = (
["0:192.168.5.2 1:192.168.4.3","node1","pc"],
["0:192.168.5.3","node2","pc"],
["0:192.168.5.4 1:192.168.3.3","node3","pc"],
["0:192.168.3.2 1:192.168.6.2 2:192.168.1.2","node4","pc"],
["0:192.168.6.3 1:192.168.1.3 2:192.168.2.3","node5","pc"],
["0:192.168.2.2 1:192.168.4.2","node6","pc"],
["0:10.1.5.2 1:10.1.4.3","node1","pc"],
["0:10.1.5.3","node2","pc"],
["0:10.1.5.4 1:10.1.3.3","node3","pc"],
["0:10.1.3.2 1:10.1.6.2 2:10.1.1.2","node4","pc"],
["0:10.1.6.3 1:10.1.1.3 2:10.1.2.3","node5","pc"],
["0:10.1.2.2 1:10.1.4.2","node6","pc"],
);
tb_compare("SELECT ips,vname,type from virt_nodes" .
" where pid=\"testbed\" and eid=\"test\"",
......
......@@ -40,10 +40,9 @@ tb-set-hardware $node4 pc
tb-set-node-os $node4 MYOS
tb-set-node-cmdline $node4 "my command line"
tb-set-node-rpms $node4 "my node rpms"
tb-set-node-rpms $node4 /my /node /rpms
tb-set-node-startup $node4 "my node startup"
tb-set-node-tarfiles $node4 dira tara dirb tarb dirc tarc
tb-set-node-deltas $node4 "deltas!"
tb-set-node-tarfiles $node4 /dira /tara /dirb /tarb /dirc /tarc
tb-set-node-failure-action $node4 nonfatal
$ns run
......@@ -5,7 +5,7 @@ source tb_compat.tcl
set node0 [$ns node]
set node1 [$ns node]
set link0 [$ns duplex-link $node1 $node0 150Mb 0ms DropTail]
set link0 [$ns duplex-link $node1 $node0 1150Mb 0ms DropTail]
$ns rtproto Static
$ns run
......
tb_prerun("tbprerun",255);
tb_prerun("tbprerun",0);
tb_run("tbswap in",255);
tb_run("tbend",0);
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