← Back to branch summary

~dobey/ubuntuone-client/transient-notify

« back to all changes in this revision

Viewing changes to tests/platform/linux/test_messaging.py

  • Committer: Tarmac
  • Author(s): Rodney Dawes
  • Date: 2012-02-06 16:40:04 UTC
  • mfrom: (1182.1.11 gi-support)
  • Revision ID: tarmac-20120206164004-7l3krm2rkc7m8c30
Remove the old, broken, and unused sdreactor code
Try the new gireactor first, and fall back to the old glib2reactor, when running scripts
Update code and tests to work correctly under either glib2reactor or gireactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/platform/linux/test_messaging.py
20
20
least they ensure 100% coverage and hence no silly/syntax errors.
21
21
 
22
22
"""
23
 
 
 
23
import sys
24
24
 
25
25
from mocker import Mocker, ANY
26
26
from twisted.internet import defer
58
58
    def _show_message_setup(self, message_time=None, message_count=None,
59
59
                            icon=None, update_count=None, real_callback=False):
60
60
        """Set up the mocker expectations for show_method."""
61
 
        indicate = self.mocker.replace("indicate")
62
61
        mock_server = self.mocker.mock()
63
 
        indicate.indicate_server_ref_default()
 
62
        if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
 
63
            indicate = self.mocker.replace("indicate")
 
64
            indicate.indicate_server_ref_default()
 
65
        else:
 
66
            indicate = self.mocker.replace('gi.repository.Indicate')
 
67
            indicate.Server.ref_default()
64
68
        self.mocker.result(mock_server)
65
69
        mock_server.connect('server-display', _server_callback)
66
70
        mock_server.set_type("message.u1")
67
71
        mock_server.set_desktop_file(
68
 
            "/usr/share/applications/ubuntuone-control-panel-gtk.desktop")
 
72
            "/usr/share/applications/ubuntuone-installer.desktop")
69
73
        mock_server.show()
70
74
        mock_indicator = self.mocker.mock()
71
75
        indicate.Indicator()