Changeset 323

Timestamp:

10/02/08 23:57:11 (2 months ago)

Author:

mbr

Message:

Simplified test suite code by creating a set of default arguments for
the gpgdir command line as each test is executed

Files:

• gpgdir/trunk/ChangeLog (modified) (1 diff)
• gpgdir/trunk/gpgdir (modified) (3 diffs)
• gpgdir/trunk/test/gpgdir_test.pl (modified) (12 diffs)

gpgdir/trunk/ChangeLog

@@ +1 @@
+gpgdir-1.9.3 (08/31/2008):
+    - Simplified test suite code by creating a set of default arguments for
+      the gpgdir command line as each test is executed.
+
-gpgdir-1.9.2 (08/31/2008):
-    - Added new modes '--sign <dir>' and '--verify <dir>' to allow all files

gpgdir/trunk/gpgdir

@@ -465 +465 @@
-
-    my @errors = <$error_fh>;
+    close $error_fh;
+
+    my @status = <$status_fh>;
+    close $status_fh;
+
+    close $input_fh;
+    close $output_fh;
+
+    waitpid $pid, 0;
-
-    if ($verbose) {
@@ -473 +482 @@
-        }
-    }
-
-    close $input_fh;
-    close $output_fh;
-    close $error_fh;
-    close $status_fh;
-
-    waitpid $pid, 0;
-
-    if (-s $out_file == 0) {
@@ -573 +575 @@
-
-    my @errors = <$error_fh>;
+    close $error_fh;
+
-    my @status = <$status_fh>;
+    close $status_fh;
-
-    close $input_fh;
-    close $output_fh;
-    close $error_fh;
-    close $status_fh;
-
-    waitpid $pid, 0;

gpgdir/trunk/test/gpgdir_test.pl

@@ -65 +65 @@
-my %md5sums = ();
-
+my $default_args = "--gnupg-dir $gpg_dir " .
+    "--Key-id $key_id --pw-file $pw_file";
+
-die "[*] Use --help" unless GetOptions(
-    'Prepare-results' => \$prepare_results,
@@ -87 +90 @@
-&test_driver('(Encrypt dir) Files recursively encrypted',
-    \&recursively_encrypted);
-d
+
-    \&skipped_hidden_files_dirs);
-&test_driver('(Decrypt dir) gpgdir directory decryption', \&decrypt);
@@ -100 +103 @@
-&test_driver('(Ascii-armor dir) Files recursively encrypted',
-    \&ascii_recursively_encrypted);
-d
+
-    \&skipped_hidden_files_dirs);
-&test_driver('(Decrypt dir) gpgdir directory decryption', \&decrypt);
@@ -113 +116 @@
-&test_driver('(Obfuscate filenames) Files recursively encrypted',
-    \&obf_recursively_encrypted);
-d
+
-    \&obf_skipped_hidden_files_dirs);
-&test_driver('(Decrypt dir) gpgdir directory decryption',
@@ -126 +129 @@
-&test_driver('(Sign/verify dir) Files recursively signed',
-    \&recursively_signed);
-d
+
-    \&skipped_hidden_files_dirs);
-&test_driver('(Sign/verify dir) Broken signature detection',
@@ -135 +138 @@
-
-### bad password detection
-ed
+
-    \&broken_passphrase);
-
@@ -195 +198 @@
-
-sub encrypt() {
-
-
+
+
+
+
+
+
+
+
-            $NO_APPEND)) {
-        return 1;
@@ -203 +212 @@
-}
-
-
-
-
+
+
-            $NO_APPEND)) {
-        return 1;
@@ -212 +220 @@
-}
-
-
-
-
+
+
-            $NO_APPEND)) {
-        return 1;
-    }
-
-
-
-
-
-
+
+
+
+
+
-            $NO_APPEND)) {
-        return 1;
-    }
-
-
-
-
-
-
+
+
+
+
+
-            $NO_APPEND)) {
-        return 1;
@@ -239 +244 @@
-}
-
-sub obf_decrypt() {
-    if (&run_cmd("$gpgdirCmd -O --gnupg-dir $gpg_dir " .
-            " --pw-file $pw_file --Key-id $key_id -d $data_dir",
-            $NO_APPEND)) {
-        return 1;
-    }
-    return &print_errors("[-] Directory decryption");
-}
-
-sub verify() {
-
-
+
-            $NO_APPEND)) {
-        return 1;
@@ -305 +300 @@
-    close F;
-
-
-
+
-            $NO_APPEND);
-
@@ -474 +468 @@
-
-sub test_mode() {
-
-
-
+
-        my $found = 0;
-        open F, "< $current_test_file"