Merge into trunk : fix-715879 : Code : Ubuntu One Control Panel

Status:

Merged

Approved by:

Natalia Bidart on 2011-02-21

Approved revision:

74

Merged at revision:

75

Proposed branch:

lp:~bilalakhtar/ubuntuone-control-panel/fix-715879

Merge into:

lp:ubuntuone-control-panel

Diff against target:

12 lines (+1/-1)

1 file modified

data/dashboard.ui (+1/-1)

To merge this branch:

bzr merge lp:~bilalakhtar/ubuntuone-control-panel/fix-715879

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Martin Albisetti (community)		Approve on 2011-02-21
Natalia Bidart (community)	2011-02-20	Approve on 2011-02-21
Review via email: mp+50500@code.launchpad.net

Commit message

AskUbuntu.com link button has now tooltip (LP: #715879).

Description of the change

This branch fixes bug #715879

Revision history for this message

Natalia Bidart (nataliabidart) wrote on 2011-02-21:

#

Thanks for the contribution!

(This member has signed the canonical contributor agreement as per https://launchpad.net/~contributor-agreement-canonical/+members)

review: Approve

Revision history for this message

Martin Albisetti (beuno) on 2011-02-21:

#

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2011-02-21:

#

Download full text (9.1 KiB)

The attempt to merge lp:~bilalakhtar/ubuntuone-control-panel/fix-715879 into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

Running test suite for ubuntuone/controlpanel/tests
Xlib: extension "RANDR" missing on display ":99.0".
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ... [OK]
    test_account_info_fails ... [OK]
    test_account_info_with_current_plan ... [OK]
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
  BackendBasicTestCase
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
  BackendDevicesTestCase
    test_backend_creation ... [OK]
    test_change_download_speed_limit ... [OK]
    test_change_limit_bandwidth ... [OK]
    test_change_show_all_notifications ... [OK]
    test_change_upload_speed_limit ... [OK]
    test_changing_settings_for_wrong_id_has_no_effect ... [OK]
    test_device_is_local ... [OK]
    test_devices_info ... [OK]
    test_devices_info_fails ... [OK]
    test_get_token ... [OK]
    test_remove_device ... [OK]
    test_remove_device_clear_credentials_if_local_device ... [OK]
    test_remove_device_fails ... [OK]
  BackendFileSyncOpsTestCase
    test_backend_creation ... [OK]
    test_connect_files ... [OK]
    test_device_is_local ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_get_token ... [OK]
    test_restart_files ... [OK]
    test_start_files ... [OK]
    test_stop_files ... [OK]
  BackendReplicationsTestCase
    test_backend_creation ... [OK]
    test_change_replication_settings ... [OK]
    test_change_replication_settings_no_setti...

The attempt to merge lp:~bilalakhtar/ubuntuone-control-panel/fix-715879 into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

Running test suite for ubuntuone/controlpanel/tests
Xlib:  extension "RANDR" missing on display ":99.0".
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ...                                                  [OK]
    test_account_info_fails ...                                            [OK]
    test_account_info_with_current_plan ...                                [OK]
    test_backend_creation ...                                              [OK]
    test_device_is_local ...                                               [OK]
    test_get_token ...                                                     [OK]
  BackendBasicTestCase
    test_backend_creation ...                                              [OK]
    test_device_is_local ...                                               [OK]
    test_get_token ...                                                     [OK]
  BackendDevicesTestCase
    test_backend_creation ...                                              [OK]
    test_change_download_speed_limit ...                                   [OK]
    test_change_limit_bandwidth ...                                        [OK]
    test_change_show_all_notifications ...                                 [OK]
    test_change_upload_speed_limit ...                                     [OK]
    test_changing_settings_for_wrong_id_has_no_effect ...                  [OK]
    test_device_is_local ...                                               [OK]
    test_devices_info ...                                                  [OK]
    test_devices_info_fails ...                                            [OK]
    test_get_token ...                                                     [OK]
    test_remove_device ...                                                 [OK]
    test_remove_device_clear_credentials_if_local_device ...               [OK]
    test_remove_device_fails ...                                           [OK]
  BackendFileSyncOpsTestCase
    test_backend_creation ...                                              [OK]
    test_connect_files ...                                                 [OK]
    test_device_is_local ...                                               [OK]
    test_disable_files ...                                                 [OK]
    test_disconnect_files ...                                              [OK]
    test_enable_files ...                                                  [OK]
    test_get_token ...                                                     [OK]
    test_restart_files ...                                                 [OK]
    test_start_files ...                                                   [OK]
    test_stop_files ...                                                    [OK]
  BackendReplicationsTestCase
    test_backend_creation ...                                              [OK]
    test_change_replication_settings ...                                   [OK]
    test_change_replication_settings_no_setting ...                        [OK]
    test_change_replication_settings_not_in_replications ...               [OK]
    test_device_is_local ...                                               [OK]
    test_get_token ...                                                     [OK]
    test_replications_info ...                                             [OK]
  BackendSyncStatusTestCase
    test_backend_creation ...                                              [OK]
    test_device_is_local ...                                               [OK]
    test_disabled ...                                                      [OK]
    test_disconnected ...                                                  [OK]
    test_disconnected_when_waiting ...                                     [OK]
    test_error ...                                                         [OK]
    test_get_token ...                                                     [OK]
    test_idle ...                                                          [OK]
    test_starting_when_init_not_user ...                                   [OK]
    test_starting_when_init_with_user ...                                  [OK]
    test_starting_when_local_rescan_not_user ...                           [OK]
    test_starting_when_local_rescan_with_user ...                          [OK]
    test_starting_when_ready_with_user ...                                 [OK]
    test_status_changed ...                                                [OK]
    test_stopped ...                                                       [OK]
    test_syncing_even_if_not_online ...                                    [OK]
    test_syncing_if_online ...                                             [OK]
    test_unknown ...                                                       [OK]
  BackendVolumesTestCase
    test_backend_creation ...                                              [OK]
    test_cached_volumes_are_initially_empty ...                            [OK]
    test_cached_volumes_are_updated_with_volume_info ...                   [OK]
    test_change_volume_settings_folder ...                                 [OK]
    test_change_volume_settings_no_setting ...                             [OK]
    test_change_volume_settings_share ...                                  [OK]
    test_device_is_local ...                                               [OK]
    test_get_token ...                                                     [OK]
    test_subscribe_volume_folder ...                                       [OK]
    test_subscribe_volume_share ...                                        [OK]
    test_unsubscribe_volume_folder ...                                     [OK]
    test_unsubscribe_volume_share ...                                      [OK]
    test_volumes_are_cached ...                                            [OK]
    test_volumes_info ...                                                  [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ...                                                            [OK]
ubuntuone.controlpanel.tests.test_replication_client
  ReplicationsTestCase
    test_exclude ...                                                       [OK]
    test_exclude_name_in_exclusions ...                                    [OK]
    test_exclude_name_not_in_replications ...                              [OK]
    test_get_exclusions ...                                                [OK]
    test_get_replications ...                                              [OK]
    test_no_pairing_record ...                                             [OK]
    test_replicate ...                                                     [OK]
    test_replicate_name_not_in_exclusions ...                              [OK]
    test_replicate_name_not_in_replications ...                            [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ...                                                            [OK]
ubuntuone.controlpanel.tests.test_utils
  ExceptionHandligTestCase
    test_exception_to_error_dict ...                                       [OK]
    test_failure_to_error_dict ...                                         [OK]
    test_is_dbus_no_reply ...                                              [OK]
    test_no_dbus_exception_is_not_dbus_no_reply ...                        [OK]
    test_other_dbus_error_is_not_dbus_no_reply ...                         [OK]
  GetDataFileTestCase
    test_get_data_file ...                                                 [OK]
  GetProjectDirTestCase
    test_get_project_dir_none_exists ...                                   [OK]
    test_get_project_dir_relative ...                                      [OK]
  GetProjectDirWithConstantsTestCase
    test_get_project_dir ...                                               [OK]
    test_get_project_dir_none_exists ...                                   [OK]
    test_get_project_dir_relative ...                                      [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ...                                                            [OK]

-------------------------------------------------------------------------------
Ran 94 tests in 0.230s

PASSED (successes=94)
[7;33m************* Module ubuntuone.controlpanel.integrationtests.test_dbus_client_sd[0m
[1;31mE1101[0m:357:FoldersMockDBusSyncDaemon.get_folders: [1;31mModule 'ubuntuone.platform.linux.dbus_interface' has no '_get_udf_dict' member[0m
[1;31mE1101[0m:387:FoldersMockDBusSyncDaemon.get_info: [1;31mInstance of 'FoldersMockDBusSyncDaemon' has no 'vm' member[0m
[1;31mE1101[0m:417:FoldersTestCase.test_get_folders: [1;31mModule 'ubuntuone.platform.linux.dbus_interface' has no '_get_udf_dict' member[0m
[1;31mE1101[0m:445:FoldersTestCase.test_create_folder: [1;31mModule 'ubuntuone.platform.linux.dbus_interface' has no '_get_udf_dict' member[0m

/usr/lib/pymodules/python2.7/gtk-2.0/gtk/__init__.py:57: GtkWarning: could not open display
  warnings.warn(str(e), _gtk.Warning)

Revision history for this message

Bilal Akhtar (bilalakhtar) wrote on 2011-02-21:

#

Err, looks like there's some problem with Auto Pilot. Could someone please mark this 'Approved' again?

1	=== modified file 'data/dashboard.ui'
2	--- data/dashboard.ui 2011-01-25 18:23:49 +0000
3	+++ data/dashboard.ui 2011-02-20 08:14:56 +0000
4	@@ -226,7 +226,7 @@
5	<child>
6	<object class="GtkImage" id="askubuntu">
7	<property name="visible">True</property>
8	- <property name="tooltip_text" translatable="yes">http://askubuntu.com/questions/tagged/ubuntu-one</property>
9	+ <property name="tooltip_text" translatable="yes">View and ask Ubuntu One related questions at AskUbuntu.com</property>
10	<property name="pixbuf">ask-ubuntu-small.png</property>
11	</object>
12	</child>

Ubuntu One Control Panel

Merge lp:~bilalakhtar/ubuntuone-control-panel/fix-715879 into lp:ubuntuone-control-panel

Commit message

Description of the change

Preview Diff

Subscribers