summaryrefslogtreecommitdiff
path: root/perl/t/stanford-naming.t
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2014-07-11 18:56:33 -0700
committerRuss Allbery <rra@stanford.edu>2014-07-11 19:03:34 -0700
commit02a629dcc319e418b2f4185acb5bfb22bc86b3eb (patch)
treee4cb07e929c06f6ea1bdc654713f1c13b108b5eb /perl/t/stanford-naming.t
parentcc9bb004ad8bc00b5685021848eeb1c0b6bd1f51 (diff)
Fix test cleanup code to run during global destruction
If we don't run the code to delete the wallet database very late, destruction of the SQLite objects may recreate the database file. Move the unlink to an END block to avoid this problem. Change-Id: Ib5ec2cbd08ba24c99f3dfa1daa01488931c5958f Reviewed-on: https://gerrit.stanford.edu/1525 Reviewed-by: Russ Allbery <rra@stanford.edu> Tested-by: Russ Allbery <rra@stanford.edu>
Diffstat (limited to 'perl/t/stanford-naming.t')
-rwxr-xr-xperl/t/stanford-naming.t6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl/t/stanford-naming.t b/perl/t/stanford-naming.t
index c512ad0..555086c 100755
--- a/perl/t/stanford-naming.t
+++ b/perl/t/stanford-naming.t
@@ -7,7 +7,7 @@
# behavior at Stanford.
#
# Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2013
+# Copyright 2013, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
# See LICENSE for licensing terms.
@@ -255,4 +255,6 @@ for my $type (qw(htpasswd ssh-rsa ssh-dsa ssl-key tivoli-key)) {
# Clean up.
$setup->destroy;
-unlink 'wallet-db';
+END {
+ unlink 'wallet-db';
+}