/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: 2019-03-17 16:54:02 UTC
  • Revision ID: teddy@recompile.se-20190317165402-g3ljjeea05p5ouvt
mandos-ctl: Refactor tests

* mandos-ctl (TestBaseCommands.test_IsEnabled): Removed; don't test
                                                internal details of
                                                command.IsEnabled.
  (TestBaseCommands.test_IsEnabled_run_exits_successfully): Rename to
                                  "test_IsEnabled_exits_successfully".
  (TestBaseCommands.test_IsEnabled_run_exits_with_failure): Rename to
                                  "test_IsEnabled_exits_with_failure".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
886
886
 
887
887
 
888
888
class Test_string_to_delta(TestCaseWithAssertLogs):
889
 
    def test_handles_basic_rfc3339(self):
 
889
    # Just test basic RFC 3339 functionality here, the doc string for
 
890
    # rfc3339_duration_to_delta() already has more comprehensive
 
891
    # tests, which is run by doctest.
 
892
 
 
893
    def test_rfc3339_zero_seconds(self):
890
894
        self.assertEqual(string_to_delta("PT0S"),
891
895
                         datetime.timedelta())
 
896
 
 
897
    def test_rfc3339_zero_days(self):
892
898
        self.assertEqual(string_to_delta("P0D"),
893
899
                         datetime.timedelta())
 
900
 
 
901
    def test_rfc3339_one_second(self):
894
902
        self.assertEqual(string_to_delta("PT1S"),
895
903
                         datetime.timedelta(0, 1))
 
904
 
 
905
    def test_rfc3339_two_hours(self):
896
906
        self.assertEqual(string_to_delta("PT2H"),
897
907
                         datetime.timedelta(0, 7200))
898
908
 
1376
1386
                testcase.assertEqual(dbus_interface,
1377
1387
                                     dbus.PROPERTIES_IFACE)
1378
1388
                self.attributes[propname] = value
1379
 
            def Get(self, interface, propname, dbus_interface):
1380
 
                testcase.assertEqual(interface, client_dbus_interface)
1381
 
                testcase.assertEqual(dbus_interface,
1382
 
                                     dbus.PROPERTIES_IFACE)
1383
 
                return self.attributes[propname]
1384
1389
            def Approve(self, approve, dbus_interface):
1385
1390
                testcase.assertEqual(dbus_interface,
1386
1391
                                     client_dbus_interface)
1458
1463
 
1459
1464
class TestBaseCommands(TestCommand):
1460
1465
 
1461
 
    def test_IsEnabled(self):
1462
 
        self.assertTrue(all(command.IsEnabled().is_enabled(client,
1463
 
                                                      properties)
1464
 
                            for client, properties
1465
 
                            in self.clients.items()))
1466
 
 
1467
 
    def test_IsEnabled_run_exits_successfully(self):
 
1466
    def test_IsEnabled_exits_successfully(self):
1468
1467
        with self.assertRaises(SystemExit) as e:
1469
1468
            command.IsEnabled().run(self.one_client)
1470
1469
        if e.exception.code is not None:
1472
1471
        else:
1473
1472
            self.assertIsNone(e.exception.code)
1474
1473
 
1475
 
    def test_IsEnabled_run_exits_with_failure(self):
 
1474
    def test_IsEnabled_exits_with_failure(self):
1476
1475
        self.client.attributes["Enabled"] = dbus.Boolean(False)
1477
1476
        with self.assertRaises(SystemExit) as e:
1478
1477
            command.IsEnabled().run(self.one_client)
1503
1502
                self.calls.append(("RemoveClient", (dbus_path,)))
1504
1503
        mandos = MockMandos()
1505
1504
        command.Remove().run(self.clients, self.bus, mandos)
1506
 
        self.assertEqual(len(mandos.calls), 2)
1507
1505
        for clientpath in self.clients:
1508
1506
            self.assertIn(("RemoveClient", (clientpath,)),
1509
1507
                          mandos.calls)
1695
1693
            for clientpath in self.clients:
1696
1694
                client = self.bus.get_object(dbus_busname, clientpath)
1697
1695
                old_value = client.attributes[self.propname]
1698
 
                self.assertNotIsInstance(old_value, self.Unique)
1699
1696
                client.attributes[self.propname] = self.Unique()
1700
1697
            self.run_command(value_to_set, self.clients)
1701
1698
            for clientpath in self.clients: