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.

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

Update google-api-php-client to 1.1.7 #24799

Merged
merged 6 commits into from
May 24, 2016
Merged

Update google-api-php-client to 1.1.7 #24799

merged 6 commits into from
May 24, 2016

Conversation

PVince81
Copy link
Contributor

Continuing Google lib update from #24516 from @Altyr

Also fixed autoloader issue.

@PVince81 PVince81 changed the title Altyr 117 upstream Update google-api-php-client to 1.1.7 May 24, 2016
@PVince81 PVince81 added this to the 9.1-current milestone May 24, 2016
@ghost
Copy link

ghost commented May 24, 2016

@Altyr

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

@PVince81
Copy link
Contributor Author

@owncloud-bot license was stated as MIT here #24516 (comment)

@PVince81
Copy link
Contributor Author

Unit test results:

Runtime:       PHP 5.6.21 with Xdebug 2.3.3
Configuration: /srv/www/htdocs/owncloud/tests/phpunit-autotest.xml

............................................F..............F..F.. 65 / 80 ( 81%)
FF..F..........                                                   80 / 80 (100%)

Time: 8.66 minutes, Memory: 62.50Mb

There were 6 failures:

1) OCA\Files_External\Tests\Storage\GoogleTest::testStat
Failed asserting that false is true.

/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:288

2) OCA\Files_External\Tests\Storage\GoogleTest::testRenameOverWriteDirectory
target/test1.txt has not been overwritten
Failed asserting that false matches expected 'foo'.

/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:489

3) OCA\Files_External\Tests\Storage\GoogleTest::testCopyOverWriteDirectory
Failed asserting that true is false.

/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:540

4) OCA\Files_External\Tests\Storage\GoogleTest::testCopyFromSameStorage with data set #0 ('/source.txt', '/target.txt')
Expected /target.txt to be a copy of /srv/www/htdocs/owncloud/tests/data/lorem.txt
Failed asserting that false matches expected 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'.

/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:196
/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:570

5) OCA\Files_External\Tests\Storage\GoogleTest::testCopyFromSameStorage with data set #1 ('/source.txt', '/target with space.txt')
Expected /target with space.txt to be a copy of /srv/www/htdocs/owncloud/tests/data/lorem.txt
Failed asserting that false matches expected 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'.

/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:196
/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:570

6) OCA\Files_External\Tests\Storage\GoogleTest::testCopyFromSameStorage with data set #4 ('/source.txt', '/tärgét.txt')
Expected /tärgét.txt to be a copy of /srv/www/htdocs/owncloud/tests/data/lorem.txt
Failed asserting that false matches expected 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'.

/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:196
/srv/www/htdocs/owncloud/tests/lib/Files/Storage/Storage.php:570

FAILURES!
Tests: 80, Assertions: 409, Failures: 6.

Even less failures than before, nice! #22481
Failures are expected, will need fixing the copy operation separately anyway.

Will do some manual regression testing.

@lanato
Copy link
Contributor

lanato commented May 24, 2016

Such a clean fix, I wasn't aware the autoloader was required in more places. Learned something again.

And the bot is going to haunt me forever, isn't it.

@PVince81
Copy link
Contributor Author

Upload/download of big files (video) also still works and so are many file operations.
Google docs file can still be downloaded as ODT.

Looks good 👍

Second review @Xenopathic @LukasReschke @icewind1991

@ghost
Copy link

ghost commented May 24, 2016

@Altyr

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

@PVince81
Copy link
Contributor Author

@Altyr sorry about the clumsy bot...
I just rebased to solve conflicts

@PVince81 PVince81 mentioned this pull request May 24, 2016
@ghost
Copy link

ghost commented May 24, 2016

@Altyr

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

@PVince81
Copy link
Contributor Author

annnnd rebased again because master had files_external completely broken... works again now

@ghost
Copy link

ghost commented May 24, 2016

@Altyr

Thanks a lot for your contribution!
Contributions to the core repo require a signed contributors agreement http://owncloud.org/about/contributor-agreement/

Alternatively you can add a comment here where you state that this contribution is MIT licensed.

Some more details about out pull request workflow can be found here: http://owncloud.org/code-reviews-on-github/

@icewind1991
Copy link
Contributor

Fixed the path to the cert bundle, I now get the same test results as @PVince81

I suspect most of the failing tests are related to caching since when I manually check the resulting files/folders in drive everything seems fine

👍

@PVince81
Copy link
Contributor Author

@icewind1991 thanks!

@PVince81 PVince81 merged commit f7d102c into master May 24, 2016
@lock
Copy link

lock bot commented Aug 5, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants