Merge into stable-3-0 : update-from-trunk : Code : ubuntuone-installer

Status:	Merged
Approved by:	dobey on 2012-03-20
Approved revision:	31
Merged at revision:	35
Proposed branch:	lp://staging/~dobey/ubuntuone-installer/update-from-trunk
Merge into:	lp://staging/ubuntuone-installer/stable-3-0
Diff against target:	455 lines (+310/-84) 2 files modified data/u1cloud.svg (+228/-0) ubuntuone/installer/gui.py (+82/-84)
To merge this branch:	bzr merge lp://staging/~dobey/ubuntuone-installer/update-from-trunk
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Roberto Alsina (community)		2012-03-20	Approve on 2012-03-20
Review via email: mp+98497@code.staging.launchpad.net

Commit message

Update the text labels, layout, and image for the installer

Revision history for this message

Roberto Alsina (ralsina) wrote on 2012-03-20:

#

+1 since it's exactly trunk and I have tested that

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-03-20:

#

Download full text (5.3 KiB)

The attempt to merge lp:~dobey/ubuntuone-installer/update-from-trunk into lp:ubuntuone-installer/stable-3-0 failed. Below is the output from the failed tests.

ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.installer.tests.test_installer
  InstallerTestCase
    test_is_installed_false ... [OK]
    test_is_installed_systemerror_false ... [OK]
    test_is_installed_systemerror_true ... [OK]
    test_is_installed_true ... [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntuone.installer.tests.test_gui
  GUITestCase
    test_initial_page ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor
    return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]
    test_page_switched ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor
    return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]
    test_progress_page ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor...

The attempt to merge lp:~dobey/ubuntuone-installer/update-from-trunk into lp:ubuntuone-installer/stable-3-0 failed. Below is the output from the failed tests.

ubuntuone.devtools.testcases
  BaseTestCase
    runTest ...                                                            [OK]
ubuntuone.installer.tests.test_installer
  InstallerTestCase
    test_is_installed_false ...                                            [OK]
    test_is_installed_systemerror_false ...                                [OK]
    test_is_installed_systemerror_true ...                                 [OK]
    test_is_installed_true ...                                             [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ...                                                            [OK]
ubuntuone.installer.tests.test_gui
  GUITestCase
    test_initial_page ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor
    return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]
    test_page_switched ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor
    return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]
    test_progress_page ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor
    return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]
    test_response_cancel ... Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor
    return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format
[ERROR]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/tests/test_gui.py", line 32, in setUp
    self.dlg = gui.Window()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 155, in __init__
    self.__info_page = self.__construct_info_page()
  File "/mnt/tarmac/cache/ubuntuone-installer/stable-3-0/ubuntuone/installer/gui.py", line 271, in __construct_info_page
    path, 320, 240, True)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 72, in constructor
    return info.invoke(cls, *args, **kwargs)
gi._glib.GError: Unrecognized image file format

ubuntuone.installer.tests.test_gui.GUITestCase.test_initial_page
ubuntuone.installer.tests.test_gui.GUITestCase.test_page_switched
ubuntuone.installer.tests.test_gui.GUITestCase.test_progress_page
ubuntuone.installer.tests.test_gui.GUITestCase.test_response_cancel
-------------------------------------------------------------------------------
Ran 10 tests in 1.280s

FAILED (errors=4, successes=6)

ubuntuone-installer

Merge lp://staging/~dobey/ubuntuone-installer/update-from-trunk into lp://staging/ubuntuone-installer/stable-3-0

Commit message

Description of the change

Preview Diff

Subscribers