Commit aa08763a authored by Mac Newbold's avatar Mac Newbold

Add a few things to the config defs file that gets generated. Also fix

stated handling when in full mode. And fix tbcmd test for new default
node/link names, and to impose an ordering in the query before it tries to
check against it.
parent 4b028950
......@@ -377,6 +377,8 @@ sub step_init {
print DEFS "TBDBNAME=$testdb\n";
print DEFS "TBOPSEMAIL=$user\@emulab.net\n";
print DEFS "TBLOGSEMAIL=$user\@emulab.net\n";
print DEFS "TBSTATEDEMAIL=$user\@emulab.net\n";
print DEFS "OURDOMAIN=test.$user.emulab.net\n";
print DEFS "BOSSNODE=$bossnode\n";
close(DEFS);
......@@ -622,14 +624,10 @@ sub step_test {
}
# Start stated
my $statedpid;
if ($type eq "full") {
# Do the fork ourselves, so that we can remember the pid
$statedpid = fork();
if (!$statedpid) {
exec("$path/install/sbin/stated -f") or
die "Error exec()ing $path/sbin/stated: $!\n";
}
# Returns non-zero for failures
system("$path/install/sbin/stated") and
die "Error running $path/install/sbin/stated: $!\n";
}
# We're now ready to run the test.
......@@ -673,6 +671,9 @@ sub step_test {
}
if ($type eq "full") {
my $statedpidfile = "$path/install/locks/stated.pid";
my $statedpid = `cat $statedpidfile` ||
prints "WARNING: Unable to find stated pid: $!\n";
if (! kill(15, $statedpid) ) {
prints "WARNING: Unable to kill stated process ($statedpid)\n";
}
......
tb_prerun("tbprerun",0);
@result = (
["l8","0.00","100000","0.013","node4:0"],
["l8","0.00","100000","0.013","node0:2"],
["lan11","0.00","100000","0.000","s5:0"],
["lan11","0.00","100000","0.000","s6:0"],
["lan11","0.00","100000","0.000","node4:1"],
["link0","0.00","100000","0.051","node0:1"],
["link0","0.00","100000","0.051","node3:0"],
["lan0","100.00","20000","0.400","node0:0"],
["lan0","150.00","30000","0.000","node1:0"],
["lan0","0.00","100000","0.106","node2:0"],
["link0","0.00","100000","0.051","node0:1"],
["link0","0.00","100000","0.051","node3:0"],
["tblan-lan11","0.00","100000","0.000","node4:1"],
["tblan-lan11","0.00","100000","0.000","s5:0"],
["tblan-lan11","0.00","100000","0.000","s6:0"],
["tblink-l8","0.00","100000","0.013","node0:2"],
["tblink-l8","0.00","100000","0.013","node4:0"],
);
tb_compare("select vname,delay,bandwidth,lossrate,member from virt_lans" .
" where pid=\"testbed\" and eid=\"test\"",\@result);
" where pid=\"testbed\" and eid=\"test\" order by vname,member",
\@result);
@result = (
["0:1.0.0.3 1:1.0.0.2 2:1.0.0.1","node0","pc"],
["0:1.0.0.2","node1","pc"],
......
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