wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-27 17:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Scribunto_LuaSandboxTests::testArgumentParsingTime more robust

Browse source 
This should make sure the tests still work, even if the running
node is heavily overloaded.

Bug: T143389
Change-Id: Ic40c8d76c8799c2e9d11f53945276747c199fd02
This commit is contained in:
Marius Hoch 2016-08-19 15:46:30 +02:00 committed by Thiemo Mättig
parent f320b8d62b
commit 12acfa95ef
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tests/phpunit/engines/LuaSandbox/SandboxTest.php
View file

@ -25,13 +25,11 @@ class Scribunto_LuaSandboxTests extends Scribunto_LuaEngineTestBase {
$frame = $pp->newFrame();
$parser->setHook( 'scribuntodelay', function () {
$ru = wfGetRusage();
$endTime = $ru['ru_utime.tv_sec'] + $ru['ru_utime.tv_usec'] / 1e6 + 0.5;
$endTime = $this->getRuTime() + 0.5;
// Waste CPU cycles
do {
$ru = wfGetRusage();
$t = $ru['ru_utime.tv_sec'] + $ru['ru_utime.tv_usec'] / 1e6;
$t = $this->getRuTime();
} while ( $t < $endTime );
return "ok";
@ -50,34 +48,54 @@ class Scribunto_LuaSandboxTests extends Scribunto_LuaEngineTestBase {
}
';
// Below we assert that the CPU time counted by LuaSandbox is $delta less than
// the CPU time actually spent.
// That way we can make sure that the time spent in the parser hook (which
// must be more than delta) is not taken into account.
$delta = 0.25;
$u0 = $engine->getInterpreter()->getCPUUsage();
$uTimeBefore = $this->getRuTime();
$frame->expand(
$pp->preprocessToObj(
'{{#invoke:TestArgumentParsingTime|f|<scribuntodelay/>}}'
)
);
$this->assertLessThan( 0.25, $engine->getInterpreter()->getCPUUsage() - $u0,
$threshold = $this->getRuTime() - $uTimeBefore - $delta;
$this->assertLessThan( $threshold, $engine->getInterpreter()->getCPUUsage() - $u0,
'Argument access time was not counted'
);
$uTimeBefore = $this->getRuTime();
$u0 = $engine->getInterpreter()->getCPUUsage();
$frame->expand(
$pp->preprocessToObj(
'{{#invoke:TestArgumentParsingTime|f2|<scribuntodelay/>}}'
)
);
$this->assertLessThan( 0.25, $engine->getInterpreter()->getCPUUsage() - $u0,
$threshold = $this->getRuTime() - $uTimeBefore - $delta;
$this->assertLessThan( $threshold, $engine->getInterpreter()->getCPUUsage() - $u0,
'Unused arguments not counted in preprocess'
);
$uTimeBefore = $this->getRuTime();
$u0 = $engine->getInterpreter()->getCPUUsage();
$frame->expand(
$pp->preprocessToObj(
'{{#invoke:TestArgumentParsingTime|f3}}'
)
);
$this->assertGreaterThan( 0.25, $engine->getInterpreter()->getCPUUsage() - $u0,
$threshold = $this->getRuTime() - $uTimeBefore - $delta;
// If the underlying node is extremely slow, this test might produce false positives
$this->assertGreaterThan( $threshold, $engine->getInterpreter()->getCPUUsage() - $u0,
'Recursive argument access time was counted'
);
}
private function getRuTime() {
$ru = wfGetRusage();
return $ru['ru_utime.tv_sec'] + $ru['ru_utime.tv_usec'] / 1e6 +
$ru['ru_stime.tv_sec'] + $ru['ru_stime.tv_usec'] / 1e6;
}
}