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

[Diego Sarmentero]

- 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.

Farewell Ubuntu One File Service

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

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...

[dobey (dobey)]

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.

[dobey (dobey)]

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-client/farewell-u1]

1407. By Diego Sarmentero on 2014-04-09

fixing date comparison

[Diego Sarmentero (diegosarmentero)]

> 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:~diegosarmentero/ubuntuone-client/farewell-u1]

1408. By Diego Sarmentero on 2014-04-09

considering same date too

[dobey (dobey)]

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

[dobey (dobey)]

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

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

[lp:~diegosarmentero/ubuntuone-client/farewell-u1]

1409. By Diego Sarmentero on 2014-04-10

fix date comparison

1410. By Diego Sarmentero on 2014-04-10

disable on june 1st

[Diego Sarmentero (diegosarmentero)]

> 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.

[dobey (dobey)]

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:~diegosarmentero/ubuntuone-client/farewell-u1]

1411. By Diego Sarmentero on 2014-04-11

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

[Diego Sarmentero (diegosarmentero)]

> 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!

[dobey (dobey)]

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2012-11-15 13:23:43 +0000
+++ tests/status/test_aggregator.py	2014-04-11 14:08:45 +0000
@@ -943,7 +943,7 @@
         self.listener.handle_AQ_CHANGE_PUBLIC_ACCESS_OK(share_id, node_id,
                                                         is_public, public_url)
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
+            2, len(self.status_frontend.notification.notifications_shown))
 
     def test_file_unpublished(self):
         """A file unpublished event is processed."""
@@ -955,7 +955,7 @@
         self.listener.handle_AQ_CHANGE_PUBLIC_ACCESS_OK(share_id, node_id,
                                                         is_public, public_url)
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
+            2, len(self.status_frontend.notification.notifications_shown))
 
     def test_download_started(self):
         """A download was added to the queue."""
@@ -1053,7 +1053,7 @@
         self.fakevm.volumes[SHARE_ID] = share
         self.listener.handle_VM_SHARE_CREATED(SHARE_ID)
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
+            2, len(self.status_frontend.notification.notifications_shown))
 
     def test_already_subscribed_new_udf_available(self):
         """A new udf that was already subscribed."""
@@ -1061,14 +1061,14 @@
         udf.subscribed = True
         self.listener.handle_VM_UDF_CREATED(udf)
         self.assertEqual(
-            0, len(self.status_frontend.notification.notifications_shown))
+            1, len(self.status_frontend.notification.notifications_shown))
 
     def test_new_udf_available(self):
         """A new udf is available for subscription."""
         udf = UDF()
         self.listener.handle_VM_UDF_CREATED(udf)
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
+            2, len(self.status_frontend.notification.notifications_shown))
 
     def test_two_new_udfs_available(self):
         """A new udf is available for subscription."""
@@ -1077,14 +1077,14 @@
         udf2 = UDF()
         self.listener.handle_VM_UDF_CREATED(udf2)
         self.assertEqual(
-            2, len(self.status_frontend.notification.notifications_shown))
+            3, len(self.status_frontend.notification.notifications_shown))
 
     def test_server_connection_lost(self):
         """The client connected to the server."""
         self.status_frontend.aggregator.connected = True
         self.listener.handle_SYS_CONNECTION_LOST()
         self.assertEqual(
-            0, len(self.status_frontend.notification.notifications_shown))
+            1, len(self.status_frontend.notification.notifications_shown))
         self.assertFalse(self.status_frontend.aggregator.connected)
 
     def test_server_connection_made(self):
@@ -1092,7 +1092,7 @@
         self.status_frontend.aggregator.connected = False
         self.listener.handle_SYS_CONNECTION_MADE()
         self.assertEqual(
-            0, len(self.status_frontend.notification.notifications_shown))
+            1, len(self.status_frontend.notification.notifications_shown))
         self.assertTrue(self.status_frontend.aggregator.connected)
 
     def test_set_show_all_notifications(self):
@@ -1117,7 +1117,7 @@
         self.listener.handle_SYS_QUOTA_EXCEEDED(
             volume_id=UDF_ID, free_bytes=0)
         self.assertEqual(
-            0, len(self.status_frontend.notification.notifications_shown))
+            1, len(self.status_frontend.notification.notifications_shown))
         mocker.restore()
         mocker.verify()
 
@@ -1138,7 +1138,7 @@
         self.listener.handle_SYS_QUOTA_EXCEEDED(
             volume_id=ROOT_ID, free_bytes=0)
         self.assertEqual(
-            0, len(self.status_frontend.notification.notifications_shown))
+            1, len(self.status_frontend.notification.notifications_shown))
         mocker.restore()
         mocker.verify()
 
@@ -1162,15 +1162,15 @@
         self.fakevm.volumes[SHARE_ID] = share
         self.listener.handle_SYS_QUOTA_EXCEEDED(SHARE_ID, BYTES)
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
+            2, len(self.status_frontend.notification.notifications_shown))
         self.listener.handle_SYS_QUOTA_EXCEEDED(SHARE_ID, BYTES)
         self.listener.handle_SYS_QUOTA_EXCEEDED(SHARE_ID, BYTES)
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
+            2, len(self.status_frontend.notification.notifications_shown))
         self.status_frontend.aggregator.clock.advance(aggregator.ONE_DAY + 1)
         self.listener.handle_SYS_QUOTA_EXCEEDED(SHARE_ID, BYTES)
         self.assertEqual(
-            2, len(self.status_frontend.notification.notifications_shown))
+            3, len(self.status_frontend.notification.notifications_shown))
         mocker.restore()
         mocker.verify()
 

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2013-03-20 21:33:53 +0000
+++ ubuntuone/status/aggregator.py	2014-04-11 14:08:45 +0000
@@ -51,6 +51,8 @@
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
 UBUNTUONE_TITLE = Q_("Ubuntu One")
+UBUNTUONE_END = Q_("Ubuntu One file services will be "
+                   "shutting down on June 1st, 2014.\nThanks for your support.")
 NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
 FINAL_COMPLETED = Q_("File synchronization completed.")
 
@@ -827,6 +829,12 @@
         self.syncdaemon_service = service
         self.sync_menu = None
         self.start_sync_menu()
+        self.farewell_ubuntuone_sync()
+
+    def farewell_ubuntuone_sync(self):
+        """Show notification about the upcoming end of UbuntuOne sync."""
+        self.notification.send_notification(
+            UBUNTUONE_TITLE, UBUNTUONE_END)
 
     def start_sync_menu(self):
         """Create the sync menu and register the progress listener."""

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2013-02-04 16:04:19 +0000
+++ ubuntuone/syncdaemon/main.py	2014-04-11 14:08:45 +0000
@@ -31,6 +31,7 @@
 import logging
 import os
 import sys
+import datetime
 
 from dirspec.utils import user_home
 from twisted.internet import defer, reactor, task
@@ -106,51 +107,58 @@
         if not throttling_enabled:
             throttling_enabled = user_config.get_throttling()
 
-        self.logger.info("Starting Ubuntu One client version %s",
-                         clientdefs.VERSION)
-        self.logger.info("Using %r as root dir", self.root_dir)
-        self.logger.info("Using %r as data dir", self.data_dir)
-        self.logger.info("Using %r as shares root dir", self.shares_dir)
-        self.db = tritcask.Tritcask(tritcask_dir)
-        self.vm = volume_manager.VolumeManager(self)
-        self.fs = filesystem_manager.FileSystemManager(
-            data_dir, partials_dir, self.vm, self.db)
-        self.event_q = event_queue.EventQueue(self.fs, ignore_files,
-                monitor_class=monitor_class)
-        self.fs.register_eq(self.event_q)
-
-        # subscribe VM to EQ, to be unsubscribed in shutdown
-        self.event_q.subscribe(self.vm)
-        self.vm.init_root()
-
-        # we don't have the oauth tokens yet, we 'll get them later
-        self.action_q = action_queue.ActionQueue(self.event_q, self,
-                                                 host, port,
-                                                 dns_srv, ssl,
-                                                 disable_ssl_verify,
-                                                 read_limit, write_limit,
-                                                 throttling_enabled)
-        self.hash_q = hash_queue.HashQueue(self.event_q)
-        events_nanny.DownloadFinishedNanny(self.fs, self.event_q, self.hash_q)
-
-        # call StateManager after having AQ
-        self.state_manager = StateManager(self, handshake_timeout)
-
-        self.sync = sync.Sync(self)
-        self.lr = local_rescan.LocalRescan(self.vm, self.fs,
-                                           self.event_q, self.action_q)
-
-        self.external = SyncdaemonService(main=self,
-                                          send_events=broadcast_events)
-        self.external.oauth_credentials = oauth_credentials
-        if user_config.get_autoconnect():
-            self.external.connect(autoconnecting=True)
-
-        self.status_listener = None
-        self.start_status_listener()
-
-        self.mark = task.LoopingCall(self.log_mark)
-        self.mark.start(mark_interval)
+        end_date = datetime.date(2014, 6, 1)
+        if datetime.date.today() < end_date:
+            self.logger.info("Starting Ubuntu One client version %s",
+                             clientdefs.VERSION)
+            self.logger.info("Using %r as root dir", self.root_dir)
+            self.logger.info("Using %r as data dir", self.data_dir)
+            self.logger.info("Using %r as shares root dir", self.shares_dir)
+            self.db = tritcask.Tritcask(tritcask_dir)
+            self.vm = volume_manager.VolumeManager(self)
+            self.fs = filesystem_manager.FileSystemManager(
+                data_dir, partials_dir, self.vm, self.db)
+            self.event_q = event_queue.EventQueue(
+                self.fs, ignore_files, monitor_class=monitor_class)
+            self.fs.register_eq(self.event_q)
+
+            # subscribe VM to EQ, to be unsubscribed in shutdown
+            self.event_q.subscribe(self.vm)
+            self.vm.init_root()
+
+            # we don't have the oauth tokens yet, we 'll get them later
+            self.action_q = action_queue.ActionQueue(self.event_q, self,
+                                                     host, port,
+                                                     dns_srv, ssl,
+                                                     disable_ssl_verify,
+                                                     read_limit, write_limit,
+                                                     throttling_enabled)
+            self.hash_q = hash_queue.HashQueue(self.event_q)
+            events_nanny.DownloadFinishedNanny(self.fs, self.event_q,
+                                               self.hash_q)
+
+            # call StateManager after having AQ
+            self.state_manager = StateManager(self, handshake_timeout)
+
+            self.sync = sync.Sync(self)
+            self.lr = local_rescan.LocalRescan(self.vm, self.fs,
+                                               self.event_q, self.action_q)
+
+            self.external = SyncdaemonService(main=self,
+                                              send_events=broadcast_events)
+            self.external.oauth_credentials = oauth_credentials
+            if user_config.get_autoconnect():
+                self.external.connect(autoconnecting=True)
+
+            self.status_listener = None
+            self.start_status_listener()
+
+            self.mark = task.LoopingCall(self.log_mark)
+            self.mark.start(mark_interval)
+        else:
+            if reactor.running:
+                reactor.stop()
+            sys.exit(0)
 
     def start_status_listener(self):
         """Start the status listener if it is configured to start."""