/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-03 01:08:58 UTC
  • Revision ID: teddy@recompile.se-20190303010858-c2l0sr6ekvzo7rlb
mandos-ctl: Separate determining what to do and actually doing it

* mandos-ctl (defaultkeywords): Removed; value moved into
                                PrintTableCmd.
  (Command): New abstract base class for commands to be run.
  (PrintCmd, PropertyCmd): New abstract classes for commands.
  (ValueArgumentMixIn, MillisecondsValueArgumentMixIn): New mixins for
                                                        commands.
  (PrintTableCmd, DumpJSONCmd, IsEnabledCmd, RemoveCmd, ApproveCmd,
  DenyCmd, EnableCmd, DisableCmd, BumpTimeoutCmd, StartCheckerCmd,
  StopCheckerCmd, ApproveByDefaultCmd, DenyByDefaultCmd,
  SetCheckerCmd, SetTimeoutCmd, SetExtendedTimeoutCmd,
  SetApprovalDelayCmd, SetApprovalDurationCmd): New commands.
  (main): Don't look directly at options and do things; instead go
          through all options and add commands to a list, then run all
          commands on clients.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
61
61
 
62
62
locale.setlocale(locale.LC_ALL, "")
63
63
 
64
 
defaultkeywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
65
64
domain = "se.recompile"
66
65
busname = domain + ".Mandos"
67
66
server_path = "/"
216
215
 
217
216
 
218
217
def string_to_delta(interval):
219
 
    """Parse a string and return a datetime.timedelta
220
 
    """
 
218
    """Parse a string and return a datetime.timedelta"""
221
219
 
222
220
    try:
223
221
        return rfc3339_duration_to_delta(interval)
228
226
 
229
227
 
230
228
def parse_pre_1_6_1_interval(interval):
231
 
    """Parse an interval string as documented by Mandos before 1.6.1, and
232
 
    return a datetime.timedelta
 
229
    """Parse an interval string as documented by Mandos before 1.6.1,
 
230
    and return a datetime.timedelta
 
231
 
233
232
    >>> parse_pre_1_6_1_interval('7d')
234
233
    datetime.timedelta(7)
235
234
    >>> parse_pre_1_6_1_interval('60s')
269
268
    return value
270
269
 
271
270
 
272
 
def print_clients(clients, keywords):
273
 
    print('\n'.join(TableOfClients(clients, keywords).rows()))
274
 
 
275
271
class TableOfClients(object):
276
272
    tablewords = {
277
273
        "Name": "Name",
302
298
        if tablewords is not None:
303
299
            self.tablewords = tablewords
304
300
 
 
301
    def __str__(self):
 
302
        return "\n".join(self.rows())
 
303
 
 
304
    if sys.version_info.major == 2:
 
305
        __unicode__ = __str__
 
306
        def __str__(self):
 
307
            return str(self).encode(locale.getpreferredencoding())
 
308
 
 
309
    def rows(self):
 
310
        format_string = self.row_formatting_string()
 
311
        rows = [self.header_line(format_string)]
 
312
        rows.extend(self.client_line(client, format_string)
 
313
                    for client in self.clients)
 
314
        return rows
 
315
 
 
316
    def row_formatting_string(self):
 
317
        "Format string used to format table rows"
 
318
        return " ".join("{{{key}:{width}}}".format(
 
319
            width=max(len(self.tablewords[key]),
 
320
                      *(len(self.string_from_client(client, key))
 
321
                        for client in self.clients)),
 
322
            key=key)
 
323
                        for key in self.keywords)
 
324
 
 
325
    def string_from_client(self, client, key):
 
326
        return self.valuetostring(client[key], key)
 
327
 
305
328
    @staticmethod
306
329
    def valuetostring(value, keyword):
307
330
        if isinstance(value, dbus.Boolean):
311
334
            return milliseconds_to_string(value)
312
335
        return str(value)
313
336
 
314
 
    def rows(self):
315
 
        # Create format string to format table rows
316
 
        format_string = " ".join("{{{key}:{width}}}".format(
317
 
            width=max(len(self.tablewords[key]),
318
 
                      max(len(self.valuetostring(client[key], key))
319
 
                          for client in self.clients)),
320
 
            key=key)
321
 
                                 for key in self.keywords)
322
 
        # Start with header line
323
 
        rows = [format_string.format(**self.tablewords)]
324
 
        for client in self.clients:
325
 
            rows.append(format_string
326
 
                        .format(**{key: self.valuetostring(client[key], key)
327
 
                                   for key in self.keywords}))
328
 
        return rows
329
 
 
 
337
    def header_line(self, format_string):
 
338
        return format_string.format(**self.tablewords)
 
339
 
 
340
    def client_line(self, client, format_string):
 
341
        return format_string.format(
 
342
            **{key: self.string_from_client(client, key)
 
343
               for key in self.keywords})
 
344
 
 
345
 
 
346
## Classes for commands.
 
347
 
 
348
# Abstract classes first
 
349
class Command(object):
 
350
    """Abstract class for commands"""
 
351
    def run(self, clients):
 
352
        """Normal commands should implement run_on_one_client(), but
 
353
        commands which want to operate on all clients at the same time
 
354
        can override this run() method instead."""
 
355
        for client in clients:
 
356
            self.run_on_one_client(client)
 
357
 
 
358
class PrintCmd(Command):
 
359
    """Abstract class for commands printing client details"""
 
360
    all_keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
 
361
                    "Created", "Interval", "Host", "KeyID",
 
362
                    "Fingerprint", "CheckerRunning", "LastEnabled",
 
363
                    "ApprovalPending", "ApprovedByDefault",
 
364
                    "LastApprovalRequest", "ApprovalDelay",
 
365
                    "ApprovalDuration", "Checker", "ExtendedTimeout",
 
366
                    "Expires", "LastCheckerStatus")
 
367
    def run(self, clients):
 
368
        print(self.output(clients))
 
369
 
 
370
class PropertyCmd(Command):
 
371
    """Abstract class for Actions for setting one client property"""
 
372
    def run_on_one_client(self, client):
 
373
        """Set the Client's D-Bus property"""
 
374
        client.Set(client_interface, self.property, self.value_to_set,
 
375
                   dbus_interface=dbus.PROPERTIES_IFACE)
 
376
 
 
377
class ValueArgumentMixIn(object):
 
378
    """Mixin class for commands taking a value as argument"""
 
379
    def __init__(self, value):
 
380
        self.value_to_set = value
 
381
 
 
382
class MillisecondsValueArgumentMixIn(ValueArgumentMixIn):
 
383
    """Mixin class for commands taking a value argument as
 
384
    milliseconds."""
 
385
    @property
 
386
    def value_to_set(self):
 
387
        return self._vts
 
388
    @value_to_set.setter
 
389
    def value_to_set(self, value):
 
390
        """When setting, convert value to a datetime.timedelta"""
 
391
        self._vts = string_to_delta(value).total_seconds() * 1000
 
392
 
 
393
# Actual (non-abstract) command classes
 
394
 
 
395
class PrintTableCmd(PrintCmd):
 
396
    def __init__(self, verbose=False):
 
397
        self.verbose = verbose
 
398
    def output(self, clients):
 
399
        if self.verbose:
 
400
            keywords = self.all_keywords
 
401
        else:
 
402
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK")
 
403
        return str(TableOfClients(clients.values(), keywords))
 
404
 
 
405
class DumpJSONCmd(PrintCmd):
 
406
    def output(self, clients):
 
407
        data = {client["Name"]:
 
408
                {key: self.dbus_boolean_to_bool(client[key])
 
409
                 for key in self.all_keywords}
 
410
                for client in clients.values()}
 
411
        return json.dumps(data, indent=4, separators=(',', ': '))
 
412
    @staticmethod
 
413
    def dbus_boolean_to_bool(value):
 
414
        if isinstance(value, dbus.Boolean):
 
415
            value = bool(value)
 
416
        return value
 
417
 
 
418
class IsEnabledCmd(Command):
 
419
    def run_on_one_client(self, client):
 
420
        if self.is_enabled(client):
 
421
            sys.exit(0)
 
422
        sys.exit(1)
 
423
    def is_enabled(self, client):
 
424
        return client.Get(client_interface, "Enabled",
 
425
                          dbus_interface=dbus.PROPERTIES_IFACE)
 
426
 
 
427
class RemoveCmd(Command):
 
428
    def __init__(self, mandos):
 
429
        self.mandos = mandos
 
430
    def run_on_one_client(self, client):
 
431
        self.mandos.RemoveClient(client.__dbus_object_path__)
 
432
 
 
433
class ApproveCmd(Command):
 
434
    def run_on_one_client(self, client):
 
435
        client.Approve(dbus.Boolean(True),
 
436
                       dbus_interface=client_interface)
 
437
 
 
438
class DenyCmd(Command):
 
439
    def run_on_one_client(self, client):
 
440
        client.Approve(dbus.Boolean(False),
 
441
                       dbus_interface=client_interface)
 
442
 
 
443
class EnableCmd(PropertyCmd):
 
444
    property = "Enabled"
 
445
    value_to_set = dbus.Boolean(True)
 
446
 
 
447
class DisableCmd(PropertyCmd):
 
448
    property = "Enabled"
 
449
    value_to_set = dbus.Boolean(False)
 
450
 
 
451
class BumpTimeoutCmd(PropertyCmd):
 
452
    property = "LastCheckedOK"
 
453
    value_to_set = ""
 
454
 
 
455
class StartCheckerCmd(PropertyCmd):
 
456
    property = "CheckerRunning"
 
457
    value_to_set = dbus.Boolean(True)
 
458
 
 
459
class StopCheckerCmd(PropertyCmd):
 
460
    property = "CheckerRunning"
 
461
    value_to_set = dbus.Boolean(False)
 
462
 
 
463
class ApproveByDefaultCmd(PropertyCmd):
 
464
    property = "ApprovedByDefault"
 
465
    value_to_set = dbus.Boolean(True)
 
466
 
 
467
class DenyByDefaultCmd(PropertyCmd):
 
468
    property = "ApprovedByDefault"
 
469
    value_to_set = dbus.Boolean(False)
 
470
 
 
471
class SetCheckerCmd(PropertyCmd, ValueArgumentMixIn):
 
472
    property = "Checker"
 
473
 
 
474
class SetHostCmd(PropertyCmd, ValueArgumentMixIn):
 
475
    property = "Host"
 
476
 
 
477
class SetSecretCmd(PropertyCmd, ValueArgumentMixIn):
 
478
    property = "Secret"
 
479
 
 
480
class SetTimeoutCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
481
    property = "Timeout"
 
482
 
 
483
class SetExtendedTimeoutCmd(PropertyCmd,
 
484
                            MillisecondsValueArgumentMixIn):
 
485
    property = "ExtendedTimeout"
 
486
 
 
487
class SetIntervalCmd(PropertyCmd, MillisecondsValueArgumentMixIn):
 
488
    property = "Interval"
 
489
 
 
490
class SetApprovalDelayCmd(PropertyCmd,
 
491
                          MillisecondsValueArgumentMixIn):
 
492
    property = "ApprovalDelay"
 
493
 
 
494
class SetApprovalDurationCmd(PropertyCmd,
 
495
                             MillisecondsValueArgumentMixIn):
 
496
    property = "ApprovalDuration"
330
497
 
331
498
def has_actions(options):
332
499
    return any((options.enable,
360
527
                        help="Print all fields")
361
528
    parser.add_argument("-j", "--dump-json", action="store_true",
362
529
                        help="Dump client data in JSON format")
363
 
    parser.add_argument("-e", "--enable", action="store_true",
364
 
                        help="Enable client")
365
 
    parser.add_argument("-d", "--disable", action="store_true",
366
 
                        help="disable client")
 
530
    enable_disable = parser.add_mutually_exclusive_group()
 
531
    enable_disable.add_argument("-e", "--enable", action="store_true",
 
532
                                help="Enable client")
 
533
    enable_disable.add_argument("-d", "--disable",
 
534
                                action="store_true",
 
535
                                help="disable client")
367
536
    parser.add_argument("-b", "--bump-timeout", action="store_true",
368
537
                        help="Bump timeout for client")
369
 
    parser.add_argument("--start-checker", action="store_true",
370
 
                        help="Start checker for client")
371
 
    parser.add_argument("--stop-checker", action="store_true",
372
 
                        help="Stop checker for client")
 
538
    start_stop_checker = parser.add_mutually_exclusive_group()
 
539
    start_stop_checker.add_argument("--start-checker",
 
540
                                    action="store_true",
 
541
                                    help="Start checker for client")
 
542
    start_stop_checker.add_argument("--stop-checker",
 
543
                                    action="store_true",
 
544
                                    help="Stop checker for client")
373
545
    parser.add_argument("-V", "--is-enabled", action="store_true",
374
546
                        help="Check if client is enabled")
375
547
    parser.add_argument("-r", "--remove", action="store_true",
382
554
                        help="Set extended timeout for client")
383
555
    parser.add_argument("-i", "--interval",
384
556
                        help="Set checker interval for client")
385
 
    parser.add_argument("--approve-by-default", action="store_true",
386
 
                        default=None, dest="approved_by_default",
387
 
                        help="Set client to be approved by default")
388
 
    parser.add_argument("--deny-by-default", action="store_false",
389
 
                        dest="approved_by_default",
390
 
                        help="Set client to be denied by default")
 
557
    approve_deny_default = parser.add_mutually_exclusive_group()
 
558
    approve_deny_default.add_argument(
 
559
        "--approve-by-default", action="store_true",
 
560
        default=None, dest="approved_by_default",
 
561
        help="Set client to be approved by default")
 
562
    approve_deny_default.add_argument(
 
563
        "--deny-by-default", action="store_false",
 
564
        dest="approved_by_default",
 
565
        help="Set client to be denied by default")
391
566
    parser.add_argument("--approval-delay",
392
567
                        help="Set delay before client approve/deny")
393
568
    parser.add_argument("--approval-duration",
396
571
    parser.add_argument("-s", "--secret",
397
572
                        type=argparse.FileType(mode="rb"),
398
573
                        help="Set password blob (file) for client")
399
 
    parser.add_argument("-A", "--approve", action="store_true",
400
 
                        help="Approve any current client request")
401
 
    parser.add_argument("-D", "--deny", action="store_true",
402
 
                        help="Deny any current client request")
 
574
    approve_deny = parser.add_mutually_exclusive_group()
 
575
    approve_deny.add_argument(
 
576
        "-A", "--approve", action="store_true",
 
577
        help="Approve any current client request")
 
578
    approve_deny.add_argument("-D", "--deny", action="store_true",
 
579
                              help="Deny any current client request")
403
580
    parser.add_argument("--check", action="store_true",
404
581
                        help="Run self-test")
405
582
    parser.add_argument("client", nargs="*", help="Client name")
414
591
        parser.error("--dump-json can only be used alone.")
415
592
    if options.all and not has_actions(options):
416
593
        parser.error("--all requires an action.")
 
594
    if options.is_enabled and len(options.client) > 1:
 
595
            parser.error("--is-enabled requires exactly one client")
417
596
 
418
597
    try:
419
598
        bus = dbus.SystemBus()
427
606
    mandos_serv_object_manager = dbus.Interface(
428
607
        mandos_dbus_objc, dbus_interface=dbus.OBJECT_MANAGER_IFACE)
429
608
 
 
609
    commands = []
 
610
 
 
611
    if options.dump_json:
 
612
        commands.append(DumpJSONCmd())
 
613
 
 
614
    if options.enable:
 
615
        commands.append(EnableCmd())
 
616
 
 
617
    if options.disable:
 
618
        commands.append(DisableCmd())
 
619
 
 
620
    if options.bump_timeout:
 
621
        commands.append(BumpTimeoutCmd(options.bump_timeout))
 
622
 
 
623
    if options.start_checker:
 
624
        commands.append(StartCheckerCmd())
 
625
 
 
626
    if options.stop_checker:
 
627
        commands.append(StopCheckerCmd())
 
628
 
 
629
    if options.is_enabled:
 
630
        commands.append(IsEnabledCmd())
 
631
 
 
632
    if options.remove:
 
633
        commands.append(RemoveCmd(mandos_serv))
 
634
 
 
635
    if options.checker is not None:
 
636
        commands.append(SetCheckerCmd())
 
637
 
 
638
    if options.timeout is not None:
 
639
        commands.append(SetTimeoutCmd(options.timeout))
 
640
 
 
641
    if options.extended_timeout:
 
642
        commands.append(
 
643
            SetExtendedTimeoutCmd(options.extended_timeout))
 
644
 
 
645
    if options.interval is not None:
 
646
        command.append(SetIntervalCmd(options.interval))
 
647
 
 
648
    if options.approved_by_default is not None:
 
649
        if options.approved_by_default:
 
650
            command.append(ApproveByDefaultCmd())
 
651
        else:
 
652
            command.append(DenyByDefaultCmd())
 
653
 
 
654
    if options.approval_delay is not None:
 
655
        command.append(SetApprovalDelayCmd(options.approval_delay))
 
656
 
 
657
    if options.approval_duration is not None:
 
658
        command.append(
 
659
            SetApprovalDurationCmd(options.approval_duration))
 
660
 
 
661
    if options.host is not None:
 
662
        command.append(SetHostCmd(options.host))
 
663
 
 
664
    if options.secret is not None:
 
665
        command.append(SetSecretCmd(options.secret))
 
666
 
 
667
    if options.approve:
 
668
        commands.append(ApproveCmd())
 
669
 
 
670
    if options.deny:
 
671
        commands.append(DenyCmd())
 
672
 
 
673
    # If no command option has been given, show table of clients,
 
674
    # optionally verbosely
 
675
    if not commands:
 
676
        commands.append(PrintTableCmd(verbose=options.verbose))
 
677
 
430
678
    # block stderr since dbus library prints to stderr
431
679
    null = os.open(os.path.devnull, os.O_RDWR)
432
680
    stderrcopy = os.dup(sys.stderr.fileno())
465
713
                log.critical("Client not found on server: %r", name)
466
714
                sys.exit(1)
467
715
 
468
 
    if not has_actions(options) and clients:
469
 
        if options.verbose or options.dump_json:
470
 
            keywords = ("Name", "Enabled", "Timeout", "LastCheckedOK",
471
 
                        "Created", "Interval", "Host", "KeyID",
472
 
                        "Fingerprint", "CheckerRunning",
473
 
                        "LastEnabled", "ApprovalPending",
474
 
                        "ApprovedByDefault", "LastApprovalRequest",
475
 
                        "ApprovalDelay", "ApprovalDuration",
476
 
                        "Checker", "ExtendedTimeout", "Expires",
477
 
                        "LastCheckerStatus")
478
 
        else:
479
 
            keywords = defaultkeywords
480
 
 
481
 
        if options.dump_json:
482
 
            json.dump({client["Name"]: {key:
483
 
                                        bool(client[key])
484
 
                                        if isinstance(client[key],
485
 
                                                      dbus.Boolean)
486
 
                                        else client[key]
487
 
                                        for key in keywords}
488
 
                       for client in clients.values()},
489
 
                      fp=sys.stdout, indent=4,
490
 
                      separators=(',', ': '))
491
 
            print()
492
 
        else:
493
 
            print_clients(clients.values(), keywords)
494
 
    else:
495
 
        # Process each client in the list by all selected options
496
 
        for client in clients:
497
 
 
498
 
            def set_client_prop(prop, value):
499
 
                """Set a Client D-Bus property"""
500
 
                client.Set(client_interface, prop, value,
501
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
502
 
 
503
 
            def set_client_prop_ms(prop, value):
504
 
                """Set a Client D-Bus property, converted
505
 
                from a string to milliseconds."""
506
 
                set_client_prop(prop,
507
 
                                string_to_delta(value).total_seconds()
508
 
                                * 1000)
509
 
 
510
 
            if options.remove:
511
 
                mandos_serv.RemoveClient(client.__dbus_object_path__)
512
 
            if options.enable:
513
 
                set_client_prop("Enabled", dbus.Boolean(True))
514
 
            if options.disable:
515
 
                set_client_prop("Enabled", dbus.Boolean(False))
516
 
            if options.bump_timeout:
517
 
                set_client_prop("LastCheckedOK", "")
518
 
            if options.start_checker:
519
 
                set_client_prop("CheckerRunning", dbus.Boolean(True))
520
 
            if options.stop_checker:
521
 
                set_client_prop("CheckerRunning", dbus.Boolean(False))
522
 
            if options.is_enabled:
523
 
                if client.Get(client_interface, "Enabled",
524
 
                              dbus_interface=dbus.PROPERTIES_IFACE):
525
 
                    sys.exit(0)
526
 
                else:
527
 
                    sys.exit(1)
528
 
            if options.checker is not None:
529
 
                set_client_prop("Checker", options.checker)
530
 
            if options.host is not None:
531
 
                set_client_prop("Host", options.host)
532
 
            if options.interval is not None:
533
 
                set_client_prop_ms("Interval", options.interval)
534
 
            if options.approval_delay is not None:
535
 
                set_client_prop_ms("ApprovalDelay",
536
 
                                   options.approval_delay)
537
 
            if options.approval_duration is not None:
538
 
                set_client_prop_ms("ApprovalDuration",
539
 
                                   options.approval_duration)
540
 
            if options.timeout is not None:
541
 
                set_client_prop_ms("Timeout", options.timeout)
542
 
            if options.extended_timeout is not None:
543
 
                set_client_prop_ms("ExtendedTimeout",
544
 
                                   options.extended_timeout)
545
 
            if options.secret is not None:
546
 
                set_client_prop("Secret",
547
 
                                dbus.ByteArray(options.secret.read()))
548
 
            if options.approved_by_default is not None:
549
 
                set_client_prop("ApprovedByDefault",
550
 
                                dbus.Boolean(options
551
 
                                             .approved_by_default))
552
 
            if options.approve:
553
 
                client.Approve(dbus.Boolean(True),
554
 
                               dbus_interface=client_interface)
555
 
            elif options.deny:
556
 
                client.Approve(dbus.Boolean(False),
557
 
                               dbus_interface=client_interface)
 
716
    # Run all commands on clients
 
717
    for command in commands:
 
718
        command.run(clients)
558
719
 
559
720
 
560
721
class Test_milliseconds_to_string(unittest.TestCase):
631
792
            },
632
793
        ]
633
794
    def test_short_header(self):
634
 
        rows = TableOfClients(self.clients, self.keywords,
635
 
                              self.tablewords).rows()
636
 
        expected_rows = [
637
 
            "X  Yy",
638
 
            "x1 y1",
639
 
            "x2 y2"]
640
 
        self.assertEqual(rows, expected_rows)
 
795
        text = str(TableOfClients(self.clients, self.keywords,
 
796
                                  self.tablewords))
 
797
        expected_text = """
 
798
X  Yy
 
799
x1 y1
 
800
x2 y2
 
801
"""[1:-1]
 
802
        self.assertEqual(text, expected_text)
641
803
    def test_booleans(self):
642
804
        keywords = ["Bool", "NonDbusBoolean"]
643
 
        rows = TableOfClients(self.clients, keywords,
644
 
                              self.tablewords).rows()
645
 
        expected_rows = [
646
 
            "A D-BUS Boolean A Non-D-BUS Boolean",
647
 
            "No              False              ",
648
 
            "Yes             True               ",
649
 
        ]
650
 
        self.assertEqual(rows, expected_rows)
 
805
        text = str(TableOfClients(self.clients, keywords,
 
806
                                  self.tablewords))
 
807
        expected_text = """
 
808
A D-BUS Boolean A Non-D-BUS Boolean
 
809
No              False              
 
810
Yes             True               
 
811
"""[1:-1]
 
812
        self.assertEqual(text, expected_text)
651
813
    def test_milliseconds_detection(self):
652
814
        keywords = ["Integer", "Timeout", "Interval", "ApprovalDelay",
653
815
                    "ApprovalDuration", "ExtendedTimeout"]
654
 
        rows = TableOfClients(self.clients, keywords,
655
 
                              self.tablewords).rows()
656
 
        expected_rows = ("""
 
816
        text = str(TableOfClients(self.clients, keywords,
 
817
                                  self.tablewords))
 
818
        expected_text = """
657
819
An Integer Timedelta 1 Timedelta 2 Timedelta 3 Timedelta 4 Timedelta 5
658
820
0          00:00:00    00:00:01    00:00:02    00:00:03    00:00:04   
659
821
1          1T02:03:05  1T02:03:06  1T02:03:07  1T02:03:08  1T02:03:09 
660
 
"""
661
 
        ).splitlines()[1:]
662
 
        self.assertEqual(rows, expected_rows)
 
822
"""[1:-1]
 
823
        self.assertEqual(text, expected_text)
663
824
    def test_empty_and_long_string_values(self):
664
825
        keywords = ["String"]
665
 
        rows = TableOfClients(self.clients, keywords,
666
 
                              self.tablewords).rows()
667
 
        expected_rows = ("""
 
826
        text = str(TableOfClients(self.clients, keywords,
 
827
                                  self.tablewords))
 
828
        expected_text = """
668
829
A String                                                                                                                                                                                                                                                                                                                                  
669
830
                                                                                                                                                                                                                                                                                                                                          
670
831
A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,A huge string which will not fit,
671
 
"""
672
 
        ).splitlines()[1:]
673
 
        self.assertEqual(rows, expected_rows)
 
832
"""[1:-1]
 
833
        self.assertEqual(text, expected_text)
674
834
 
675
835
 
676
836