Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve tests #1227

Merged
merged 2 commits into from
Sep 1, 2016
Merged

Improve tests #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c1d74
Remove unneeded Windows logic
MorrisJobke Sep 1, 2016
56b58b0
properly load APCu extension on CLI to execute APCu tests
MorrisJobke Sep 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build:
commands:
- ./autotest-js.sh
nodb-php5.6:
image: nextcloudci/php5.6:1.0.6
image: nextcloudci/php5.6:php5.6-1
commands:
- rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
- git submodule update --init
Expand Down
17 changes: 0 additions & 17 deletions lib/private/LargeFileHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,23 +137,6 @@ public function getFileSizeViaCurl($fileName) {
return null;
}

/**
* @brief Tries to get the size of a file via the Windows DOM extension.
*
* @param string $filename Path to the file.
*
* @return null|int|float Number of bytes as number (float or int) or
* null on failure.
*/
public function getFileSizeViaCOM($filename) {
if (class_exists('COM')) {
$fsObj = new \COM("Scripting.FileSystemObject");
$file = $fsObj->GetFile($filename);
return 0 + $file->Size;
}
return null;
}

/**
* @brief Tries to get the size of a file via an exec() call.
*
Expand Down
15 changes: 0 additions & 15 deletions tests/lib/LargeFileHelperGetFileSizeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,6 @@ public function testGetFileSizeViaCurl($filename, $fileSize) {
);
}

/**
* @dataProvider dataFileNameProvider
*/
public function testGetFileSizeViaCOM($filename, $fileSize) {
if (!extension_loaded('COM')) {
$this->markTestSkipped(
'The PHP Windows COM extension is required for this test.'
);
}
$this->assertSame(
$fileSize,
$this->helper->getFileSizeViaCOM($filename)
);
}

/**
* @dataProvider dataFileNameProvider
*/
Expand Down