/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 Hogeborn
  • Date: 2020-03-21 18:40:48 UTC
  • mfrom: (237.4.128 release)
  • Revision ID: teddy@recompile.se-20200321184048-3d4iik78z2un9mqx
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
89
89
 
90
90
locale.setlocale(locale.LC_ALL, "")
91
91
 
92
 
version = "1.8.9"
 
92
version = "1.8.10"
93
93
 
94
94
 
95
95
def main():
497
497
                             self.properties_iface, interface, key,
498
498
                             value)
499
499
 
 
500
        def call_method(self, methodname, busname, objectpath,
 
501
                        interface, *args):
 
502
            raise NotImplementedError()
 
503
 
 
504
 
500
505
    class MandosBus(SystemBus):
501
506
        busname_domain = "se.recompile"
502
507
        busname = busname_domain + ".Mandos"
1627
1632
        finally:
1628
1633
            dbus_logger.removeFilter(counting_handler)
1629
1634
 
1630
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1635
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1631
1636
 
1632
1637
        # Make sure the dbus logger was suppressed
1633
1638
        self.assertEqual(0, counting_handler.count)
1770
1775
            self.call_method(bus, "methodname", "busname",
1771
1776
                             "objectpath", "interface")
1772
1777
 
1773
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1778
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1774
1779
 
1775
1780
    def test_get_converts_to_correct_exception(self):
1776
1781
        bus = pydbus_adapter.SystemBus(