[homekit-connector][shelly-connector] Refactoring to configuration (#…

…172)
FastyBird · Nov 19, 2023 · e38dd79 · e38dd79
1 parent 9719c16
commit e38dd79
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/tests/cases/unit/BaseTestCase.php b/tests/cases/unit/BaseTestCase.php
@@ -11,7 +11,9 @@
 use function constant;
 use function defined;
 use function file_exists;
+use function getmypid;
 use function md5;
+use function strval;
 use function time;
 
 abstract class BaseTestCase extends TestCase
@@ -43,7 +45,9 @@ protected function createContainer(string|null $additionalConfig = null): Nette\
 		$config->setForceReloadContainer();
 		$config->setTempDirectory(FB_TEMP_DIR);
 
-		$config->addStaticParameters(['container' => ['class' => 'SystemContainer_' . md5((string) time())]]);
+		$config->addStaticParameters(
+			['container' => ['class' => 'SystemContainer_' . strval(getmypid()) . md5((string) time())]],
+		);
 		$config->addStaticParameters(['appDir' => $rootDir, 'wwwDir' => $rootDir, 'vendorDir' => $vendorDir]);
 
 		$config->addConfig(__DIR__ . '/../../common.neon');

diff --git a/tests/cases/unit/DbTestCase.php b/tests/cases/unit/DbTestCase.php
@@ -24,12 +24,14 @@
 use function feof;
 use function fgets;
 use function fopen;
+use function getmypid;
 use function in_array;
 use function md5;
 use function rtrim;
 use function set_time_limit;
 use function sprintf;
 use function strlen;
+use function strval;
 use function substr;
 use function time;
 use function trim;
@@ -130,7 +132,9 @@ private function createContainer(): Nette\DI\Container
 		$config->setForceReloadContainer();
 		$config->setTempDirectory(FB_TEMP_DIR);
 
-		$config->addStaticParameters(['container' => ['class' => 'SystemContainer_' . md5((string) time())]]);
+		$config->addStaticParameters(
+			['container' => ['class' => 'SystemContainer_' . strval(getmypid()) . md5((string) time())]],
+		);
 		$config->addStaticParameters(['appDir' => $rootDir, 'wwwDir' => $rootDir, 'vendorDir' => $vendorDir]);
 
 		$config->addConfig(__DIR__ . '/../../common.neon');

diff --git a/tests/tools/ConnectionWrapper.php b/tests/tools/ConnectionWrapper.php
@@ -30,8 +30,8 @@ public function __construct(
 	)
 	{
 		$this->dbName = is_string(getenv('TEST_TOKEN'))
-			? 'fb_test_' . getmypid() . getenv('TEST_TOKEN') ?? ''
-			: 'fb_test_' . getmypid();
+			? 'fb_test_' . getmypid() . md5((string) time()) . getenv('TEST_TOKEN') ?? ''
+			: 'fb_test_' . getmypid() . md5((string) time());
 
 		unset($params['dbname']);
 

diff --git a/tools/phpunit-bootstrap.php b/tools/phpunit-bootstrap.php
@@ -2,13 +2,15 @@
 
 // phpcs:ignoreFile
 
-if (!defined('FB_TEMP_DIR')) {
-	define('FB_TEMP_DIR', __DIR__ . '/../var/tools/PHPUnit/tmp');
-}
-
-if (!defined('FB_LOGS_DIR')) {
-	define('FB_LOGS_DIR', __DIR__ . '/../var/tools/PHPUnit/logs');
-}
+define('FB_APP_DIR', realpath(__DIR__ . '/..'));
+define('FB_CONFIG_DIR', realpath(__DIR__ . '/../config'));
+define('FB_VENDOR_DIR', realpath(__DIR__ . '/../vendor'));
+is_string(getenv('TEST_TOKEN'))
+	? define('FB_TEMP_DIR', __DIR__ . '/../var/tools/PHPUnit/tmp/' . getmypid() . '-' . md5((string) time()) . '-' . getenv('TEST_TOKEN') ?? '')
+	: define('FB_TEMP_DIR', __DIR__ . '/../var/tools/PHPUnit/tmp/' . getmypid() . '-' . md5((string) time()));
+is_string(getenv('TEST_TOKEN'))
+	? define('FB_LOGS_DIR', __DIR__ . '/../var/tools/PHPUnit/logs/' . getmypid() . '-' . md5((string) time()) . '-' . getenv('TEST_TOKEN') ?? '')
+	: define('FB_LOGS_DIR', __DIR__ . '/../var/tools/PHPUnit/logs/' . getmypid() . '-' . md5((string) time()));
 
 if (@!include __DIR__ . '/../vendor/autoload.php') {
 	echo 'Install Tester using `composer update --dev`';