tests: Move environment creation and teardown into each test.
authorJustus Winter <justus@g10code.com>
Mon, 7 Nov 2016 15:21:21 +0000 (16:21 +0100)
committerJustus Winter <justus@g10code.com>
Mon, 7 Nov 2016 15:36:36 +0000 (16:36 +0100)
commita55393cb5f4b331cb3a715c7d9a8b91f7606f337
tree7e19d86a3271b4a3acade27c1509bd7f2b504478
parentac078469cbafe85cf771fca84f376740850d10b0
tests: Move environment creation and teardown into each test.

* tests/gpgscm/tests.scm (log): New function.
* tests/openpgp/run-tests.scm (run-tests-parallel): Do not run the
startup and teardown scripts.
(run-tests-sequential): Likewise.
* tests/openpgp/setup.scm: Move all functions...
* tests/openpgp/defs.scm: ... here and make them less verbose.
(setup-environment): New function.
(setup-legacy-environment): Likewise.
(start-agent): Make less verbose, run 'stop-agent' at interpreter
exit.
(stop-agent): Make less verbose.
* tests/openpgp/finish.scm: Drop file.
* tests/openpgp/Makefile.am (EXTRA_DIST): Drop removed file.
* tests/openpgp/4gb-packet.scm: Use 'setup-environment' or
'setup-legacy-environment' as appropriate.
* tests/openpgp/armdetach.scm: Likewise.
* tests/openpgp/armdetachm.scm: Likewise.
* tests/openpgp/armencrypt.scm: Likewise.
* tests/openpgp/armencryptp.scm: Likewise.
* tests/openpgp/armor.scm: Likewise.
* tests/openpgp/armsignencrypt.scm: Likewise.
* tests/openpgp/armsigs.scm: Likewise.
* tests/openpgp/clearsig.scm: Likewise.
* tests/openpgp/conventional-mdc.scm: Likewise.
* tests/openpgp/conventional.scm: Likewise.
* tests/openpgp/decrypt-dsa.scm: Likewise.
* tests/openpgp/decrypt.scm: Likewise.
* tests/openpgp/default-key.scm: Likewise.
* tests/openpgp/detach.scm: Likewise.
* tests/openpgp/detachm.scm: Likewise.
* tests/openpgp/ecc.scm: Likewise.
* tests/openpgp/encrypt-dsa.scm: Likewise.
* tests/openpgp/encrypt.scm: Likewise.
* tests/openpgp/encryptp.scm: Likewise.
* tests/openpgp/export.scm: Likewise.
* tests/openpgp/finish.scm: Likewise.
* tests/openpgp/genkey1024.scm: Likewise.
* tests/openpgp/gpgtar.scm: Likewise.
* tests/openpgp/gpgv-forged-keyring.scm: Likewise.
* tests/openpgp/import.scm: Likewise.
* tests/openpgp/issue2015.scm: Likewise.
* tests/openpgp/issue2417.scm: Likewise.
* tests/openpgp/issue2419.scm: Likewise.
* tests/openpgp/key-selection.scm: Likewise.
* tests/openpgp/mds.scm: Likewise.
* tests/openpgp/multisig.scm: Likewise.
* tests/openpgp/quick-key-manipulation.scm: Likewise.
* tests/openpgp/seat.scm: Likewise.
* tests/openpgp/shell.scm: Likewise.
* tests/openpgp/signencrypt-dsa.scm: Likewise.
* tests/openpgp/signencrypt.scm: Likewise.
* tests/openpgp/sigs-dsa.scm: Likewise.
* tests/openpgp/sigs.scm: Likewise.
* tests/openpgp/ssh.scm: Likewise.
* tests/openpgp/tofu.scm: Likewise.
* tests/openpgp/use-exact-key.scm: Likewise.
* tests/openpgp/verify.scm: Likewise.
* tests/openpgp/version.scm: Likewise.
* tests/openpgp/issue2346.scm: Likewise and simplify.
--

The previous Bourne Shell-based test suite created the environment
before running all tests, and tore it down after executing them.  When
we created the Scheme-based test suite, we kept this design at first,
but introduced a way to run each test in its own environment to
prevent tests from interfering with each other.  Nevertheless, every
test started out with the same environment.

Move the creation of the test environment into each test.  This gives
us finer control over the environment each test is run in.  It also
makes it possible to run each test by simply executing it using gpgscm
without the use of the runner.  Furthermore, it has the neat
side-effect of speeding up the test suite if run in parallel.

Signed-off-by: Justus Winter <justus@g10code.com>
50 files changed:
tests/gpgscm/tests.scm
tests/openpgp/4gb-packet.scm
tests/openpgp/Makefile.am
tests/openpgp/armdetach.scm
tests/openpgp/armdetachm.scm
tests/openpgp/armencrypt.scm
tests/openpgp/armencryptp.scm
tests/openpgp/armor.scm
tests/openpgp/armsignencrypt.scm
tests/openpgp/armsigs.scm
tests/openpgp/clearsig.scm
tests/openpgp/conventional-mdc.scm
tests/openpgp/conventional.scm
tests/openpgp/decrypt-dsa.scm
tests/openpgp/decrypt.scm
tests/openpgp/default-key.scm
tests/openpgp/defs.scm
tests/openpgp/detach.scm
tests/openpgp/detachm.scm
tests/openpgp/ecc.scm
tests/openpgp/encrypt-dsa.scm
tests/openpgp/encrypt.scm
tests/openpgp/encryptp.scm
tests/openpgp/export.scm
tests/openpgp/finish.scm [deleted file]
tests/openpgp/genkey1024.scm
tests/openpgp/gpgtar.scm
tests/openpgp/gpgv-forged-keyring.scm
tests/openpgp/import.scm
tests/openpgp/issue2015.scm
tests/openpgp/issue2346.scm
tests/openpgp/issue2417.scm
tests/openpgp/issue2419.scm
tests/openpgp/key-selection.scm
tests/openpgp/mds.scm
tests/openpgp/multisig.scm
tests/openpgp/quick-key-manipulation.scm
tests/openpgp/run-tests.scm
tests/openpgp/seat.scm
tests/openpgp/setup.scm
tests/openpgp/shell.scm
tests/openpgp/signencrypt-dsa.scm
tests/openpgp/signencrypt.scm
tests/openpgp/sigs-dsa.scm
tests/openpgp/sigs.scm
tests/openpgp/ssh.scm
tests/openpgp/tofu.scm
tests/openpgp/use-exact-key.scm
tests/openpgp/verify.scm
tests/openpgp/version.scm