Merge into trunk : use-translations-1074116 : Code : Ubuntu One Control Panel

Status:

Merged

Approved by:

Mike McCracken on 2012-12-17

Approved revision:

386

Merged at revision:

390

Proposed branch:

lp://qastaging/~mikemc/ubuntuone-control-panel/use-translations-1074116

Merge into:

lp://qastaging/ubuntuone-control-panel

Prerequisite:

lp://qastaging/~mikemc/ubuntuone-control-panel/updater-common

Diff against target:

44 lines (+8/-11)

2 files modified

ubuntuone/controlpanel/__init__.py (+0/-1)
ubuntuone/controlpanel/gui/__init__.py (+8/-10)

To merge this branch:

bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/use-translations-1074116

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Brian Curtin (community)		Approve on 2012-12-13
Michał Karnicki (community)	2012-12-12	Approve on 2012-12-13
Review via email: mp+139546@code.qastaging.launchpad.net

Commit message

- Use new SSO API to get platform-appropriate translation function. (LP: 1074116)

Description of the change

- Use new SSO API to get platform-appropriate translation function. (LP: 1074116)

See notes on https://code.launchpad.net/~mikemc/ubuntu-sso-client/cross-platform-translations-1074116/+merge/139536 for howto test.

Revision history for this message

Michał Karnicki (karni) on 2012-12-13:

#

review: Approve

Revision history for this message

Brian Curtin (brian.curtin) on 2012-12-13:

#

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-12-13:

#

Download full text (7.3 KiB)

The attempt to merge lp:~mikemc/ubuntuone-control-panel/use-translations-1074116 into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
...

The attempt to merge lp:~mikemc/ubuntuone-control-panel/use-translations-1074116 into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ...                                                            [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ...                                             [OK]
  DBusServiceTestCase
    test_cant_register_twice ...                                      [SKIPPED]
    test_dbus_busname_created ...                                          [OK]
    test_error_handler_default ...                                         [OK]
    test_error_handler_with_exception ...                                  [OK]
    test_error_handler_with_failure ...                                    [OK]
    test_error_handler_with_non_string_dict ...                            [OK]
    test_error_handler_with_string_dict ...                                [OK]
    test_register_service ...                                              [OK]
  FileSyncTestCase
    test_file_sync_status_changed ...                                      [OK]
    test_file_sync_status_disabled ...                                     [OK]
    test_file_sync_status_disconnected ...                                 [OK]
    test_file_sync_status_error ...                                        [OK]
    test_file_sync_status_idle ...                                         [OK]
    test_file_sync_status_starting ...                                     [OK]
    test_file_sync_status_stopped ...                                      [OK]
    test_file_sync_status_syncing ...                                      [OK]
    test_file_sync_status_unknown ...                                      [OK]
    test_status_changed_handler ...                                        [OK]
    test_status_changed_handler_after_status_requested ...                 [OK]
    test_status_changed_handler_after_status_requested_twice ...           [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ...                                         [OK]
    test_change_device_settings ...                                        [OK]
    test_change_replication_settings ...                                   [OK]
    test_change_volume_settings ...                                        [OK]
    test_connect_files ...                                                 [OK]
    test_devices_info_returned ...                                         [OK]
    test_disable_files ...                                                 [OK]
    test_disconnect_files ...                                              [OK]
    test_enable_files ...                                                  [OK]
    test_remove_device ...                                                 [OK]
    test_replications_info ...                                             [OK]
    test_restart_files ...                                                 [OK]
    test_start_files ...                                                   [OK]
    test_stop_files ...                                                    [OK]
    test_volumes_info ...                                                  [OK]
  OperationsErrorTestCase
    test_account_info_returned ...                                         [OK]
    test_change_device_settings ...                                        [OK]
    test_change_replication_settings ...                                   [OK]
    test_change_volume_settings ...                                        [OK]
    test_connect_files ...                                                 [OK]
    test_devices_info_returned ...                                         [OK]
    test_disable_files ...                                                 [OK]
    test_disconnect_files ...                                              [OK]
    test_enable_files ...                                                  [OK]
    test_remove_device ...                                                 [OK]
    test_replications_info ...                                             [OK]
    test_restart_files ...                                                 [OK]
    test_start_files ...                                                   [OK]
    test_stop_files ...                                                    [OK]
    test_volumes_info ...                                                  [OK]
  OperationsTestCase
    test_account_info_returned ...                                         [OK]
    test_change_device_settings ...                                        [OK]
    test_change_replication_settings ...                                   [OK]
    test_change_volume_settings ...                                        [OK]
    test_connect_files ...                                                 [OK]
    test_devices_info_returned ...                                         [OK]
    test_disable_files ...                                                 [OK]
    test_disconnect_files ...                                              [OK]
    test_enable_files ...                                                  [OK]
    test_remove_device ...                                                 [OK]
    test_replications_info ...                                             [OK]
    test_restart_files ...                                                 [OK]
    test_start_files ...                                                   [OK]
    test_stop_files ...                                                    [OK]
    test_volumes_info ...                                                  [OK]
  ShutdownTestCase
    test_shutdown ...                                                      [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ...                                                            [OK]

===============================================================================
[SKIPPED]
Must run 2nd check in another process.

ubuntuone.controlpanel.dbustests.test_dbus_service.DBusServiceTestCase.test_cant_register_twice
-------------------------------------------------------------------------------
Ran 70 tests in 0.966s

PASSED (skips=1, successes=69)
*** Running test suite for ubuntuone/controlpanel ***

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 40, in <module>
    main()
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 277, in main
    suite = test_runner.get_suite(options)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 173, in get_suite
    config['ignore-paths']))
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 157, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 98, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/gui/__init__.py", line 25, in <module>
    from ubuntu_sso.utils.translation import get_gettext
ImportError: No module named translation

Ubuntu One Control Panel

Merge lp://qastaging/~mikemc/ubuntuone-control-panel/use-translations-1074116 into lp://qastaging/ubuntuone-control-panel

Commit message

Description of the change

Preview Diff

Subscribers