Skip to content

Conversation

@icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Feb 12, 2018

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Feb 12, 2018
@icewind1991 icewind1991 added this to the Nextcloud 14 milestone Feb 12, 2018
@icewind1991 icewind1991 added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Feb 12, 2018
@codecov
Copy link

codecov bot commented Feb 13, 2018

Codecov Report

Merging #8314 into master will increase coverage by 0.1%.
The diff coverage is 34.83%.

@@             Coverage Diff             @@
##             master    #8314     +/-   ##
===========================================
+ Coverage     51.72%   51.82%   +0.1%     
+ Complexity    25380    25364     -16     
===========================================
  Files          1600     1601      +1     
  Lines         95089    95025     -64     
  Branches       1377     1377             
===========================================
+ Hits          49184    49246     +62     
+ Misses        45905    45779    -126
Impacted Files Coverage Δ Complexity Δ
apps/files_external/lib/Lib/Storage/Swift.php 0% <0%> (ø) 104 <6> (-9) ⬇️
lib/private/Files/ObjectStore/SwiftFactory.php 54.43% <54.43%> (ø) 30 <30> (?)
lib/private/Files/ObjectStore/Swift.php 75% <73.33%> (+75%) 8 <4> (-37) ⬇️
apps/files_trashbin/lib/Trashbin.php 72.7% <0%> (+0.24%) 136% <0%> (ø) ⬇️

@icewind1991 icewind1991 force-pushed the openstack branch 6 times, most recently from fdebb9c to 5db961d Compare February 14, 2018 12:58
@icewind1991 icewind1991 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 14, 2018
@icewind1991 icewind1991 mentioned this pull request Feb 14, 2018
2 tasks
@MorrisJobke
Copy link
Member

Conflicts :/

@icewind1991
Copy link
Member Author

All rebased

@rullzer
Copy link
Member

rullzer commented Feb 19, 2018

I rebased as I want the swift tests to pass here :P

@icewind1991
Copy link
Member Author

The swift docker image is being a PITA, I'm trying to get it more reliable

@rullzer rullzer force-pushed the openstack branch 3 times, most recently from ce72206 to d5f5c84 Compare February 19, 2018 20:40
* Also create a test file so we know for sure it all works

Signed-off-by: Roeland Jago Douma <[email protected]>
@rullzer rullzer merged commit 980c780 into master Feb 19, 2018
@rullzer rullzer deleted the openstack branch February 19, 2018 21:22
@MorrisJobke
Copy link
Member

@oparoz No backport of this - it's just too much for a backport.

@rullzer Could you backport your last commit to stable13 to have better CI experience on stable13 as well?

@rullzer
Copy link
Member

rullzer commented Feb 20, 2018

@MorrisJobke we don't run swift tests on stable13


// cleanup
if ($this->unlink($path1) === false) {
throw new \Exception('failed to remove original');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The two lines after this are unreachable 🙈

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants