Commit b7d83943 authored by Leigh Stoller's avatar Leigh Stoller

Fix a couple of ron/all tests that Mac spotted as being broken.

parent 9060b112
......@@ -618,9 +618,13 @@ elseif (isset($nsdata) && strcmp($nsdata, "")) {
}
else {
#
# Not allowed anymore!
# I am going to allow shell experiments to be created (No NS file),
# but only by admin types.
#
RESPIT("NS File", "You must provide an NS file. No nodes is fine.");
if (! ISADMIN($uid)) {
RESPIT("NS File", "You must provide an NS file");
}
$nonsfile = 1;
}
#
......
......@@ -73,7 +73,7 @@ $query_result =
"where rs.pnodes>0 and ".
" e.state='" . $TB_EXPTSTATE_ACTIVE . "' and " .
" e.pid!='emulab-ops' and ".
" (e.pid!='ron' and e.eid!='all') ".
" not (e.pid='ron' and e.eid='all') ".
"order by s.swapin_last desc ");
echo "<a NAME=active></a>\n";
......
......@@ -276,7 +276,7 @@ function showrange ($showby, $sortby, $range) {
"left join experiment_resources as r on s.rsrcidx=r.idx ".
"where e.state='" . $TB_EXPTSTATE_ACTIVE . "'" .
" and e.pid!='$TBOPSPID' and ".
" (e.pid!='ron' and e.eid!='all') ");
" not (e.pid='ron' and e.eid='all') ");
while ($row = mysql_fetch_assoc($query_result)) {
$pid = $row["pid"];
......
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