Libertine

Merge lp:~larryprice/libertine/fix-service-test-sigs into lp:libertine

fix-service-test-sigs
Merge into devel

Proposed by Larry Price on 2017-03-10

Status:	Merged
Approved by:	Christopher Townsend on 2017-03-10
Approved revision:	409
Merged at revision:	436
Proposed branch:	lp:~larryprice/libertine/fix-service-test-sigs
Merge into:	lp:libertine
Diff against target:	81 lines (+27/-22) 1 file modified tests/integration/test_libertine_service.py (+27/-22)
To merge this branch:	bzr merge lp:~larryprice/libertine/fix-service-test-sigs
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2017-03-10	Approve on 2017-03-10
Libertine CI Bot	continuous-integration		Approve on 2017-03-10
Review via email: mp+319599@code.launchpad.net

Commit message

Update signal handlers in test_libertine_service to reflect new API.

Description of the change

Update signal handlers in test_libertine_service to reflect new API. This will fix the test failures which occur when the signals are actually fired.

lp:~larryprice/libertine/fix-service-test-sigs updated on 2017-03-10

409. By Larry Price on 2017-03-10: attach signals in setup

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/459/rebuild

review: Approve (continuous-integration)

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/460/rebuild

review: Approve (continuous-integration)

Revision history for this message

Christopher Townsend (townsend) wrote on 2017-03-10:

Ok, good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Larry Price

Libertine Developers

 === modified file 'tests/integration/test_libertine_service.py'
 --- tests/integration/test_libertine_service.py	2017-03-07 19:41:49 +0000
 +++ tests/integration/test_libertine_service.py	2017-03-10 16:38:39 +0000
@@ -71,11 +71,19 @@
          self.error = None
          self.result = None
          self.event = threading.Event()
++        self.signals = []
          for retries in range(1, 11):
              try:
                  self._bus =  dbus.SessionBus()
                  self._libertined = self._bus.get_object(constants.SERVICE_NAME, constants.OPERATIONS_OBJECT)
++
++                self.signals.append(self._bus.add_signal_receiver(path=constants.OPERATIONS_MONITOR_OBJECT, handler_function=self._finished_handler,
++                                        dbus_interface=constants.OPERATIONS_MONITOR_INTERFACE, signal_name='finished'))
++                self.signals.append(self._bus.add_signal_receiver(path=constants.OPERATIONS_MONITOR_OBJECT, handler_function=self._data_handler,
++                                         dbus_interface=constants.OPERATIONS_MONITOR_INTERFACE, signal_name='data'))
++                self.signals.append(self._bus.add_signal_receiver(path=constants.OPERATIONS_MONITOR_OBJECT, handler_function=self._error_handler,
++                                         dbus_interface=constants.OPERATIONS_MONITOR_INTERFACE, signal_name='error'))
                  break
              except dbus.DBusException as e:
                  print("Service not available (attempt %i/10). Exception: %s" % (retries, str(e)))
@@ -85,39 +93,36 @@
              except Exception as e:
                  self.fail('Exception occurred during connection: %s' % str(e))
++    def tearDown(self):
++        for signal in self.signals:
++            self._bus._clean_up_signal_match(signal)
++
      def _finished_handler(self, path):
--        self.event.set()
--
--    def _data_handler(self, message):
--        self.result = message
--
--    def _error_handler(self, message):
--        self.error = message
--        self.event.set()
++        if self.path == path:
++            self.event.set()
++
++    def _data_handler(self, path, message):
++        if self.path == path:
++            self.result = message
++
++    def _error_handler(self, path, message):
++        if self.path == path:
++            self.error = message
++            self.event.set()
      def _send(self, func):
          self.event.clear()
          self.result = None
--        obj_path = func()
--        signals = []
--        signals.append(self._bus.add_signal_receiver(path=constants.OPERATIONS_MONITOR_OBJECT, handler_function=self._finished_handler,
--                                dbus_interface=constants.OPERATIONS_MONITOR_INTERFACE, signal_name='finished'))
--        signals.append(self._bus.add_signal_receiver(path=constants.OPERATIONS_MONITOR_OBJECT, handler_function=self._data_handler,
--                                 dbus_interface=constants.OPERATIONS_MONITOR_INTERFACE, signal_name='data'))
--        signals.append(self._bus.add_signal_receiver(path=constants.OPERATIONS_MONITOR_OBJECT, handler_function=self._error_handler,
--                                 dbus_interface=constants.OPERATIONS_MONITOR_INTERFACE, signal_name='error'))
++        self.path = func()
          monitor = self._bus.get_object(constants.SERVICE_NAME, constants.OPERATIONS_MONITOR_OBJECT)
--        if monitor.running(obj_path):
++        if monitor.running(self.path):
              self.event.wait(5)
              self.assertIsNone(self.error)
--        self.assertEqual('', monitor.last_error(obj_path))
--        self.result = monitor.result(obj_path)
--
--        for signal in signals:
--            self._bus._clean_up_signal_match(signal)
++        self.assertEqual('', monitor.last_error(self.path))
++        self.result = monitor.result(self.path)
          return self.result