/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 plugins.d/usplash.xml

  • Committer: Teddy Hogeborn
  • Date: 2021-02-03 23:10:42 UTC
  • Revision ID: teddy@recompile.se-20210203231042-2z3egrvpo1zt7nej
mandos-ctl: Fix bad test for command.Remove and related minor issues

The test for command.Remove removes all clients from the spy server,
and then loops over all clients, looking for the corresponding Remove
command as recorded by the spy server.  But since since there aren't
any clients left after they were removed, no assertions are made, and
the test therefore does nothing.  Fix this.

In tests for command.Approve and command.Deny, add checks that clients
were not somehow removed by the command (in which case, likewise, no
assertions are made).

Add related checks to TestPropertySetterCmd.runTest; i.e. test that a
sequence is not empty before looping over it and making assertions.

* mandos-ctl (TestBaseCommands.test_Remove): Save a copy of the
  original "clients" dict, and loop over those instead.  Add assertion
  that all clients were indeed removed.  Also fix the code which looks
  for the Remove command, which now needs to actually work.
  (TestBaseCommands.test_Approve, TestBaseCommands.test_Deny): Add
  assertion that there are still clients before looping over them.
  (TestPropertySetterCmd.runTest): Add assertion that the list of
  values to get is not empty before looping over them.  Also add check
  that there are still clients before looping over clients.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY COMMANDNAME "usplash">
5
 
<!ENTITY TIMESTAMP "2016-03-05">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
40
40
      <year>2014</year>
41
41
      <year>2015</year>
42
42
      <year>2016</year>
 
43
      <year>2017</year>
 
44
      <year>2018</year>
 
45
      <year>2019</year>
43
46
      <holder>Teddy Hogeborn</holder>
44
47
      <holder>Björn Påhlsson</holder>
45
48
    </copyright>
132
135
        <para>
133
136
          These variables will normally be inherited from
134
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
135
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
136
 
          normally have inherited them from
137
 
          <filename>/scripts/local-top/cryptroot</filename> in the
138
 
          initial <acronym>RAM</acronym> disk environment, which will
139
 
          have set them from parsing kernel arguments and
140
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
141
 
          initial RAM disk environment), which in turn will have been
142
 
          created when the initial RAM disk image was created by
143
 
          <filename
144
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
145
 
          extracting the information of the root file system from
146
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
147
140
        </para>
148
141
        <para>
149
142
          This behavior is meant to exactly mirror the behavior of
287
280
    <para>
288
281
      <citerefentry><refentrytitle>intro</refentrytitle>
289
282
      <manvolnum>8mandos</manvolnum></citerefentry>,
290
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
291
 
      <manvolnum>5</manvolnum></citerefentry>,
292
283
      <citerefentry><refentrytitle>fifo</refentrytitle>
293
284
      <manvolnum>7</manvolnum></citerefentry>,
294
285
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>