zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-03-17 20:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #234 from zhamao-robot/fix-some-tests

Browse Source 
暂时停用网络请求测试并修复文件系统测试
This commit is contained in:
sunxyw 2023-01-04 13:46:09 +08:00 committed by GitHub
commit f8c4bc01bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ZM/Store/FileSystem.php
View File

@ -25,6 +25,11 @@ class FileSystem
logger()->warning(zm_internal_errcode('E00080') . '扫描目录失败，目录不存在');
return false;
}
// 检查目录是否可读
if (!is_readable($dir)) {
logger()->warning(zm_internal_errcode('E00080') . '扫描目录失败，目录不可读');
return false;
}
logger()->debug('扫描' . $dir);
// 套上 zm_dir
$scan_list = scandir($dir);

2
tests/ZM/Store/FileSystemTest.php
View File

@ -127,7 +127,7 @@ class FileSystemTest extends TestCase
$old_perm = $this->vfs->getPermissions();
$this->vfs->chmod(0000);
FileSystem::scanDirFiles($this->vfs->url());
$this->assertLogged('warning', zm_internal_errcode('E00080') . '扫描目录失败，目录无法读取: ' . $this->vfs->url());
$this->assertLogged('warning', zm_internal_errcode('E00080') . '扫描目录失败，目录不可读');
$this->vfs->chmod($old_perm);
}
}

20
tests/ZM/Utils/ZMRequestTest.php
View File

@ -15,18 +15,20 @@ class ZMRequestTest extends TestCase
{
public function testPost()
{
$r = ZMRequest::post('http://httpbin.org/post', [], 'niubi=123');
$this->assertStringContainsString('123', $r);
$r2 = ZMRequest::post('http://httpbin.org/post', ['User-Agent' => 'test'], 'oijoij=ooo', [], false);
$this->assertInstanceOf(ResponseInterface::class, $r2);
$this->assertStringContainsString('ooo', $r2->getBody()->getContents());
$this->markTestIncomplete('Potential dead on Windows');
// $r = ZMRequest::post('http://httpbin.org/post', [], 'niubi=123');
// $this->assertStringContainsString('123', $r);
// $r2 = ZMRequest::post('http://httpbin.org/post', ['User-Agent' => 'test'], 'oijoij=ooo', [], false);
// $this->assertInstanceOf(ResponseInterface::class, $r2);
// $this->assertStringContainsString('ooo', $r2->getBody()->getContents());
}
public function testGet()
{
$r = ZMRequest::get('http://httpbin.org/get', [
'X-Test' => '123',
]);
$this->assertStringContainsString('123', $r);
$this->markTestIncomplete('Potential dead on Windows');
// $r = ZMRequest::get('http://httpbin.org/get', [
// 'X-Test' => '123',
// ]);
// $this->assertStringContainsString('123', $r);
}
}