Ubuntu One Control Panel

Merge lp://staging/~dobey/ubuntuone-control-panel/use-dirspec into lp://staging/ubuntuone-control-panel

  1. use-dirspec
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 335
Merged at revision: 334
Proposed branch: lp://staging/~dobey/ubuntuone-control-panel/use-dirspec
Merge into: lp://staging/ubuntuone-control-panel
Diff against target: 61 lines (+5/-5)
5 files modified
data/source_ubuntuone-control-panel.py (+1/-1)
ubuntuone/controlpanel/backend.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+1/-1)
ubuntuone/controlpanel/logger.py (+1/-1)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-control-panel/use-dirspec
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Manuel de la Peña (community) Approve
Brian Curtin (community) Approve
Review via email: mp+111481@code.staging.launchpad.net

Commit message

Get the log directory from the platform logging module

Description of the change

This depends on https://code.launchpad.net/~dobey/ubuntuone-client/use-dirspec/+merge/111479 landing first.

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
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 (154.4 KiB)

The attempt to merge lp:~dobey/ubuntuone-control-panel/use-dirspec 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_...

lp://staging/~dobey/ubuntuone-control-panel/use-dirspec updated
335. By dobey

Fix the pep8 warnings

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

+1

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

to all changes: