merge to 10219

This commit is contained in:
Colin Kuskie 2009-04-08 16:35:31 +00:00
parent ae28bf79c8
commit 4c1307e3d0
194 changed files with 8203 additions and 2134 deletions

View file

@ -149,8 +149,6 @@ is($eh->canShowBasedOnIP(''), 0, 'canShowBasedOnIP: must send IP setting');
#
####################################################
my $origDebugIp = $session->setting->get('debugIp');
my $origShowDebug = $session->setting->get('showDebug');
$session->setting->set('showDebug', 0);
delete $eh->{_canShowDebug};
@ -183,8 +181,6 @@ ok($eh->canShowDebug, 'canShowDebug: returns 1 if debugIp is set and IP address
#
####################################################
my $origShowPerf = $session->setting->get('showPerformanceIndicators');
$session->setting->set('showPerformanceIndicators', 0);
is($eh->canShowPerformanceIndicators, 0, 'canShowPerformanceIndicators: returns 0 if not enabled');
@ -243,8 +239,4 @@ TODO: {
}
END {
$session->setting->set('debugIp', $origDebugIp);
$session->setting->set('showDebug', $origShowDebug);
$session->setting->set('showPerformanceIndicators', $origShowPerf);
}