D1817.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1817.id.diff
View Options

	diff --git a/DevCentralDockerTest.php b/DevCentralDockerTest.php
	--- a/DevCentralDockerTest.php
	+++ b/DevCentralDockerTest.php
	@@ -31,12 +31,24 @@
	'nginx: master process',
	'nginx: worker process',
	'php-fpm: master process',
	- 'PhabricatorTaskmasterDaemon',
	- 'PhabricatorBot',
	+ 'phd-daemon',
	];

	foreach ($expectedProcesses as $expectedProcess) {
	$this->assertContains($expectedProcess, $processes, "The process $expectedProcess isn't currently launched.");
	}
	}
	+
	+ public function testPhabricatorDaemons () {
	+ $daemons = $this->container->exec("/opt/phabricator/bin/phd status");
	+
	+ $expectedDaemons = [
	+ 'PhabricatorRepositoryPullLocalDaemon',
	+ 'PhabricatorTaskmasterDaemon',
	+ ];
	+
	+ foreach ($expectedDaemons as $expectedDaemon) {
	+ $this->assertContains($expectedDaemon, $daemons, "The daemon $expectedDaemon isn't currently launched.");
	+ }
	+ }
	}
	diff --git a/Makefile b/Makefile
	--- a/Makefile
	+++ b/Makefile
	@@ -5,7 +5,7 @@

	ENV_FOR_TEST_FULL= \
	DOCKER_ACCESS=1 \
	- DOCKER_HOST=dwellers.nasqueron.org \
	+ DOCKER_HOST=equatower.nasqueron.org \

	test:
	phpunit --log-junit build/phpunit.xml -v .
	diff --git a/utils/DockerContainer.php b/utils/DockerContainer.php
	--- a/utils/DockerContainer.php
	+++ b/utils/DockerContainer.php
	@@ -44,7 +44,7 @@
	* @return string the command output
	*/
	public function exec ($command) : string {
	- $output = `ssh $this->host docker exec $this->container $command`;
	+ $output = `ssh $this->host sudo docker exec $this->container $command`;
	return trim($output);
	}
	}