Ubuntu One Control Panel

Merge lp:~brian.curtin/ubuntuone-control-panel/withicon-test-fix into lp:ubuntuone-control-panel

  1. withicon-test-fix
  2. Merge into trunk
Proposed by Brian Curtin on 2012-03-27
Status: Merged
Approved by: Roberto Alsina on 2012-03-29
Approved revision: 301
Merged at revision: 303
Proposed branch: lp:~brian.curtin/ubuntuone-control-panel/withicon-test-fix
Merge into: lp:ubuntuone-control-panel
Diff against target: 13 lines (+2/-1)
1 file modified
ubuntuone/controlpanel/utils/tests/test_windows.py (+2/-1)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-control-panel/withicon-test-fix
Reviewer Review Type Date Requested Status
dobey (community) Approve on 2012-03-28
Natalia Bidart 2012-03-27 Approve on 2012-03-27
Review via email: mp+99588@code.launchpad.net

Commit Message

- Match test behavior with updated functionality.

Description of the Change

This change got left behind un-pushed, causing the tests to fail because --with-icon was not added to the expected string.

To post a comment you must log in.
Natalia Bidart (nataliabidart) :
review: Approve
dobey (dobey) :
review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (93.1 KiB)

The attempt to merge lp:~brian.curtin/ubuntuone-control-panel/withicon-test-fix into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***
ubuntuone.controlpanel.utils.tests.test_utils
  ExceptionHandlingTestCase
    test_exception_to_error_dict ... [OK]
    test_failure_to_error_dict ... [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]
ubuntuone.controlpanel.utils.tests.test_linux
  AutoupdaterTestCase
    test_are_updates_present ... [OK]
    test_perform_update ... [OK]
  DefaultFoldersTestCase
    test_default_folders_bad_encoding ... [OK]
    test_default_folders_empty_file ... [OK]
    test_default_folders_non_ascii ... [OK]
    test_default_folders_not_file ... [OK]
    test_default_folders_only_comments ... [OK]
    test_default_folders_parsed ... [OK]
    test_default_folders_syntax_error ... [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_sd_client
  AutoconnectTestCase
    test_disable ... [OK]
    test_disable_throws_an_error ... ...

Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (94.5 KiB)

The attempt to merge lp:~brian.curtin/ubuntuone-control-panel/withicon-test-fix into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***
ubuntuone.controlpanel.utils.tests.test_utils
  ExceptionHandlingTestCase
    test_exception_to_error_dict ... [OK]
    test_failure_to_error_dict ... [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]
ubuntuone.controlpanel.utils.tests.test_linux
  AutoupdaterTestCase
    test_are_updates_present ... [OK]
    test_perform_update ... [OK]
  DefaultFoldersTestCase
    test_default_folders_bad_encoding ... [OK]
    test_default_folders_empty_file ... [OK]
    test_default_folders_non_ascii ... [OK]
    test_default_folders_not_file ... [OK]
    test_default_folders_only_comments ... [OK]
    test_default_folders_parsed ... [OK]
    test_default_folders_syntax_error ... [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_sd_client
  AutoconnectTestCase
    test_disable ... [OK]
    test_disable_throws_an_error ... ...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/utils/tests/test_windows.py'
2--- ubuntuone/controlpanel/utils/tests/test_windows.py 2012-03-23 21:20:18 +0000
3+++ ubuntuone/controlpanel/utils/tests/test_windows.py 2012-03-27 18:58:20 +0000
4@@ -164,7 +164,8 @@
5 [((self.registry.OpenKey, 'Ubuntu One', 0, 1,
6 '"%s\\ubuntuone-syncdaemon.exe"' % path), {}),
7 ((self.registry.OpenKey, 'Ubuntu One Icon', 0, 1,
8- '"%s\\ubuntuone-control-panel-qt.exe" --minimized' % path),
9+ '"%s\\ubuntuone-control-panel-qt.exe" '
10+ '--minimized --with-icon' % path),
11 {})])
12
13 def test_not_added_if_not_frozen(self):

Subscribers

People subscribed via source and target branches