tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8181-umc-traer-cambios' into 'develop' 

UM replicated

See merge request artica/pandorafms!4506
This commit is contained in:
Daniel Rodriguez 2021-10-28 09:41:41 +00:00
parent 7cd429d9f8 77bee9f3ca
commit dfede4de78
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/godmode/um_client/lib/UpdateManager/Client.php
View File

@ -1276,6 +1276,7 @@ class Client
$file = trim(str_replace("\0", '', $this->productPath.'/'.$file)); $file = trim(str_replace("\0", '', $this->productPath.'/'.$file));
if (file_exists($file) === true if (file_exists($file) === true
&& is_file($delete_files_txt) === true && is_file($delete_files_txt) === true
&& is_dir($file) === false
) { ) {
unlink($file); unlink($file);
$processed[$file] = 'removed'; $processed[$file] = 'removed';

9
pandora_console/godmode/um_client/tests/ClientTest.php
View File

@ -183,7 +183,7 @@ class ClientTest extends \PHPUnit\Framework\TestCase
try { try {
$this->conf = new \Config('client/conf/test.ini'); $this->conf = new \Config('client/conf/test.ini');
} catch (\Exception $e) { } catch (\Exception $e) {
$this->fail($e->xdebug_message); $this->fail($e->getMessage());
} }
// Verify endpoint has all needed stuff, like licenses and OUM packages. // Verify endpoint has all needed stuff, like licenses and OUM packages.
@ -510,7 +510,12 @@ class ClientTest extends \PHPUnit\Framework\TestCase
$this->assertEquals(0, $umc_enterprise->getMR()); $this->assertEquals(0, $umc_enterprise->getMR());
$umc_enterprise->updateLastVersion(); try {
$umc_enterprise->updateLastVersion();
} catch (\Exception $e) {
echo $e->getTraceAsString();
$this->fail('Failed while updating: '.$e->getMessage());
}
$this->assertEquals( $this->assertEquals(
4, 4,