revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-08 07:52:39 +01:00
Code Issues Releases Wiki Activity

Make "arcanist/" unit tests pass

Browse source 
Summary: Ref T13395. Fixes a file-locking test and removes a logging test that's more trouble than it's worth.

Test Plan: Ran "arc unit --everything" locally, got a clean bill of health.

Maniphest Tasks: T13395

Differential Revision: https://secure.phabricator.com/D20984
This commit is contained in:
epriestley 2020-02-12 15:57:47 -08:00
parent 61e059984a
commit a8a50b2fc0
3 changed files with 86 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/filesystem/__tests__/PhutilDeferredLogTestCase.php
View file

@ -94,28 +94,6 @@ final class PhutilDeferredLogTestCase extends PhutilTestCase {
$this->assertTrue($caught instanceof Exception);
}
public function testManyWriters() {
$root = phutil_get_library_root('arcanist').'/../';
$bin = $root.'scripts/test/deferred_log.php';
$n_writers = 3;
$n_lines = 8;
$tmp = new TempFile();
$futures = array();
for ($ii = 0; $ii < $n_writers; $ii++) {
$futures[] = new ExecFuture('%s %d %s', $bin, $n_lines, (string)$tmp);
}
id(new FutureIterator($futures))
->resolveAll();
$this->assertEqual(
str_repeat("abcdefghijklmnopqrstuvwxyz\n", $n_writers * $n_lines),
Filesystem::readFile($tmp));
}
public function testNoWrite() {
$tmp = new TempFile();

6
src/filesystem/__tests__/PhutilFileLockTestCase.php
View file

@ -172,11 +172,13 @@ final class PhutilFileLockTestCase extends PhutilTestCase {
private function buildLockFuture($flags, $file) {
$root = dirname(phutil_get_library_root('arcanist'));
$bin = $root.'/scripts/utils/lock.php';
$bin = $root.'/support/test/lock-file.php';
$flags = (array)$flags;
// NOTE: Use `exec` so this passes on Ubuntu, where the default `dash` shell
// will eat any kills we send during the tests.
$future = new ExecFuture('exec php %s %C %s', $bin, $flags, $file);
$future = new ExecFuture('exec php -f %R -- %Ls %R', $bin, $flags, $file);
$future->start();
return $future;
}

82
support/test/lock-file.php Normal file
View file

@ -0,0 +1,82 @@
#!/usr/bin/env php
<?php
require_once dirname(__FILE__).'/../../scripts/init/init-script.php';
$args = new PhutilArgumentParser($argv);
$args->setTagline(pht('acquire and hold a lockfile'));
$args->setSynopsis(<<<EOHELP
**lock.php** __file__ [__options__]
Acquire a lockfile and hold it until told to unlock it.
EOHELP
);
$args->parseStandardArguments();
$args->parse(array(
array(
'name' => 'test',
'help' => pht('Instead of holding the lock, release it and exit.'),
),
array(
'name' => 'hold',
'help' => pht('Hold indefinitely without prompting.'),
),
array(
'name' => 'wait',
'param' => 'n',
'help' => pht('Block for up to __n__ seconds waiting for the lock.'),
'default' => 0,
),
array(
'name' => 'file',
'wildcard' => true,
),
));
$file = $args->getArg('file');
if (count($file) !== 1) {
$args->printHelpAndExit();
}
$file = head($file);
$console = PhutilConsole::getConsole();
$console->writeOut(
"%s\n",
pht('This process has PID %d. Acquiring lock...', getmypid()));
$lock = PhutilFileLock::newForPath($file);
try {
$lock->lock($args->getArg('wait'));
} catch (PhutilFileLockException $ex) {
$console->writeOut(
"**%s** %s\n",
pht('UNABLE TO ACQUIRE LOCK:'),
pht('Lock is already held.'));
exit(1);
}
// NOTE: This string is magic, the unit tests look for it.
$console->writeOut("%s\n", pht('LOCK ACQUIRED'));
if ($args->getArg('test')) {
$lock->unlock();
exit(0);
}
if ($args->getArg('hold')) {
while (true) {
sleep(1);
}
}
while (!$console->confirm(pht('Release lock?'))) {
// Keep asking until they say yes.
}
$console->writeOut("%s\n", pht('Unlocking...'));
$lock->unlock();
$console->writeOut("%s\n", pht('Done.'));
exit(0);