Ubuntu One Client

Merge lp://staging/~diegosarmentero/ubuntuone-client/farewell-u1 into lp://staging/ubuntuone-client

  1. farewell-u1
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: dobey
Approved revision: 1411
Merged at revision: 1404
Proposed branch: lp://staging/~diegosarmentero/ubuntuone-client/farewell-u1
Merge into: lp://staging/ubuntuone-client
Diff against target: 252 lines (+74/-58)
3 files modified
tests/status/test_aggregator.py (+13/-13)
ubuntuone/status/aggregator.py (+8/-0)
ubuntuone/syncdaemon/main.py (+53/-45)
To merge this branch: bzr merge lp://staging/~diegosarmentero/ubuntuone-client/farewell-u1
Reviewer Review Type Date Requested Status
dobey (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+214519@code.staging.launchpad.net

Commit message

- Show a message when the client is started indicating that the service will be suspended on June 1st.
- After June 1st, don't contact the server.

Description of the change

Farewell Ubuntu One File Service

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (384.3 KiB)

The attempt to merge lp:~diegosarmentero/ubuntuone-client/farewell-u1 into lp:ubuntuone-client failed. Below is the output from the failed tests.

*** Running test suite for tests ***
running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/contrib
creating build/lib.linux-x86_64-2.7/contrib/testing
copying contrib/testing/testcase.py -> build/lib.linux-x86_64-2.7/contrib/testing
copying contrib/testing/__init__.py -> build/lib.linux-x86_64-2.7/contrib/testing
creating build/lib.linux-x86_64-2.7/ubuntuone
creating build/lib.linux-x86_64-2.7/ubuntuone/platform
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/ipc_service.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/dbus_service.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/common.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
creating build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/common.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/tunnel_client.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/tunnel_server.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/logger.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
creating build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/notification.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/logger.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/aggregator.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/windows.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/tools
copying ubuntuone/platform/tools/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/tools
copying ubuntuone/platform/tools/__init__.py -> bu...

Revision history for this message
dobey (dobey) wrote :

88 + if datetime.date.today() != end_date:

So on June 2 and every day not June 1 2014, we'll start trying to connect again? And pop the notification every time syncdaemon starts up?

Do we really need to pop the notification *every* time syncdaemon starts up? We've already sent e-mails to everyone, made a blog post, and it's been picked up on several news sites. On June 1, all the existing connections will drop and it will just fail to connect anyway.

Revision history for this message
dobey (dobey) :
review: Needs Fixing
lp://staging/~diegosarmentero/ubuntuone-client/farewell-u1 updated
1407. By Diego Sarmentero

fixing date comparison

Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

> 88 + if datetime.date.today() != end_date:
>
> So on June 2 and every day not June 1 2014, we'll start trying to connect
> again? And pop the notification every time syncdaemon starts up?
>
> Do we really need to pop the notification *every* time syncdaemon starts up?
> We've already sent e-mails to everyone, made a blog post, and it's been picked
> up on several news sites. On June 1, all the existing connections will drop
> and it will just fail to connect anyway.

Fixed

lp://staging/~diegosarmentero/ubuntuone-client/farewell-u1 updated
1408. By Diego Sarmentero

considering same date too

Revision history for this message
dobey (dobey) wrote :

This branch seems to be introducing the test failure. I built the current package in pbuilder for saucy, and it built just fine. After adding this patch to create a new package to upload for SRU, and attempting to build it, I am getting the same test failures on saucy.

review: Needs Fixing
Revision history for this message
dobey (dobey) wrote :

88 + if datetime.date.today() >= end_date:

Now the check is backwards. It should be today <= end.

lp://staging/~diegosarmentero/ubuntuone-client/farewell-u1 updated
1409. By Diego Sarmentero

fix date comparison

1410. By Diego Sarmentero

disable on june 1st

Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

> 88 + if datetime.date.today() >= end_date:
>
> Now the check is backwards. It should be today <= end.

Fixed.
But the tests from trunk are failing for me in the same way here.

Revision history for this message
dobey (dobey) wrote :

The tests are failing because this branch causes an extra notification to pop, so all the expectations are wrong in the tests.

I've proposed https://code.launchpad.net/~dobey/ubuntuone-client/farewell-u1/+merge/215303 to merge into this branch. If you merge it in, the tests should pass again. It works for me in the package.

lp://staging/~diegosarmentero/ubuntuone-client/farewell-u1 updated
1411. By Diego Sarmentero

merging lp:~dobey/ubuntuone-client/farewell-u1 branch to fix tests

Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

> The tests are failing because this branch causes an extra notification to pop,
> so all the expectations are wrong in the tests.
>
> I've proposed https://code.launchpad.net/~dobey/ubuntuone-
> client/farewell-u1/+merge/215303 to merge into this branch. If you merge it
> in, the tests should pass again. It works for me in the package.

Thanks, done!

Revision history for this message
dobey (dobey) :
review: Approve

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