Merge lp://staging/~nikwen/ubuntu-filemanager-app/compressed-tars into lp://staging/ubuntu-filemanager-app

Proposed by Niklas Wenzel
Status: Merged
Approved by: Niklas Wenzel
Approved revision: 373
Merged at revision: 385
Proposed branch: lp://staging/~nikwen/ubuntu-filemanager-app/compressed-tars
Merge into: lp://staging/ubuntu-filemanager-app
Diff against target: 124 lines (+58/-1)
4 files modified
src/app/qml/ui/FolderListPage.qml (+22/-1)
src/plugin/archives/archives.cpp (+18/-0)
src/plugin/archives/archives.h (+2/-0)
tests/autopilot/filemanager/tests/test_filemanager.py (+16/-0)
To merge this branch: bzr merge lp://staging/~nikwen/ubuntu-filemanager-app/compressed-tars
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+249250@code.staging.launchpad.net

Commit message

Added support for compressed tar archive extraction

Thanks to Carla Sella for fixing the failing autopilot tests before I even had the chance to look at the results. :)

Description of the change

Added support for compressed tar archive extraction

To post a comment you must log in.
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Let's see whether the autopilot test changes work. :D

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Carla Sella (carla-sella) wrote :
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

I'll just note tests in trunk do pass:

http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/453/

That said, there might need to be some changes made to tests in trunk.

Revision history for this message
Carla Sella (carla-sella) wrote :

I found the problem, the tar.bz2 and tar.gz files in the content directory are wrong, the content must be the same as the .tar and .zip ones otherwise the tests fail.
I tried to push my changes, but I do not have permission.

Revision history for this message
Carla Sella (carla-sella) wrote :
Revision history for this message
Carla Sella (carla-sella) wrote :
Revision history for this message
Carla Sella (carla-sella) wrote :
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Just give me some time to look into it myself! :D :p

You're right, of course. I got the command for producing the archives wrong. Embarassing!

I'll happily merge your changes. ;)

Revision history for this message
Carla Sella (carla-sella) wrote :

:-) no worries, four eyes are better than two ;).

Revision history for this message
Niklas Wenzel (nikwen) wrote :

Let's wait for someone to review it now. Thanks again. ;)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Looks good to me.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Niklas Wenzel (nikwen) wrote :

This looks like an error with resolving dependencies in the chroot.
I'll push a no-change commit to trigger automatic tests again.

373. By Niklas Wenzel

No-change commit to trigger autopilot tests again

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Niklas Wenzel (nikwen) wrote :

So it worked this time. :)
Since I haven't changed anything since Arto's approval, I'll do a top-level approval myself now. Thank you to all who were involved. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches