/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 "2017-02-23">
 
5
<!ENTITY TIMESTAMP "2019-02-10">
6
6
<!ENTITY % common SYSTEM "../common.ent">
7
7
%common;
8
8
]>
41
41
      <year>2015</year>
42
42
      <year>2016</year>
43
43
      <year>2017</year>
 
44
      <year>2018</year>
 
45
      <year>2019</year>
44
46
      <holder>Teddy Hogeborn</holder>
45
47
      <holder>Björn Påhlsson</holder>
46
48
    </copyright>
133
135
        <para>
134
136
          These variables will normally be inherited from
135
137
          <citerefentry><refentrytitle>plugin-runner</refentrytitle>
136
 
          <manvolnum>8mandos</manvolnum></citerefentry>, which will
137
 
          normally have inherited them from
138
 
          <filename>/scripts/local-top/cryptroot</filename> in the
139
 
          initial <acronym>RAM</acronym> disk environment, which will
140
 
          have set them from parsing kernel arguments and
141
 
          <filename>/conf/conf.d/cryptroot</filename> (also in the
142
 
          initial RAM disk environment), which in turn will have been
143
 
          created when the initial RAM disk image was created by
144
 
          <filename
145
 
          >/usr/share/initramfs-tools/hooks/cryptroot</filename>, by
146
 
          extracting the information of the root file system from
147
 
          <filename >/etc/crypttab</filename>.
 
138
          <manvolnum>8mandos</manvolnum></citerefentry>, which might
 
139
          have in turn inherited them from its calling process.
148
140
        </para>
149
141
        <para>
150
142
          This behavior is meant to exactly mirror the behavior of
288
280
    <para>
289
281
      <citerefentry><refentrytitle>intro</refentrytitle>
290
282
      <manvolnum>8mandos</manvolnum></citerefentry>,
291
 
      <citerefentry><refentrytitle>crypttab</refentrytitle>
292
 
      <manvolnum>5</manvolnum></citerefentry>,
293
283
      <citerefentry><refentrytitle>fifo</refentrytitle>
294
284
      <manvolnum>7</manvolnum></citerefentry>,
295
285
      <citerefentry><refentrytitle>plugin-runner</refentrytitle>