/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: teddy at recompile
  • Date: 2020-01-12 01:53:04 UTC
  • Revision ID: teddy@recompile.se-20200112015304-gqif9w4pbyix8w6b
mandos-ctl: Fix minor bug in tests

Fix two tests, the last assert of which would always erroneously
succeed.  (No change in non-test code needed.)

* mandos-ctl (Test_dbus_python_adapter_SystemBus): In the
  test_call_method_handles_exception() method, fix check for
  dbus.ConnectFailed exception.
  (Test_pydbus_adapter_SystemBus): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
1632
1632
        finally:
1633
1633
            dbus_logger.removeFilter(counting_handler)
1634
1634
 
1635
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1635
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1636
1636
 
1637
1637
        # Make sure the dbus logger was suppressed
1638
1638
        self.assertEqual(0, counting_handler.count)
1775
1775
            self.call_method(bus, "methodname", "busname",
1776
1776
                             "objectpath", "interface")
1777
1777
 
1778
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1778
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1779
1779
 
1780
1780
    def test_get_converts_to_correct_exception(self):
1781
1781
        bus = pydbus_adapter.SystemBus(