abstract out create config in tests

[debbugs.git] / t / 12_merge.t

diff --git a/t/12_merge.t b/t/12_merge.t
index 2ae7833574f2d1ab7bea85e9e3eb7ff791b0ba8f..4857f143967327f4a8e537ac5faf6cb5e207b235 100644 (file)
--- a/t/12_merge.t
+++ b/t/12_merge.t
@@ -1,6 +1,6 @@
 # -*- mode: cperl;-*-
 
-use Test::More tests => 32;
+use Test::More tests => 35;
 
 use warnings;
 use strict;
@@ -26,7 +26,7 @@ use Data::Dumper;
 $SIG{CHLD} = sub {};
 my %config;
 eval {
-     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+     %config = create_debbugs_configuration();
 };
 if ($@) {
      BAIL_OUT($@);
@@ -36,13 +36,7 @@ my $sendmail_dir = $config{sendmail_dir};
 my $spool_dir = $config{spool_dir};
 my $config_dir = $config{config_dir};
 
-END{
-     if ($ENV{DEBUG}) {
-         diag("spool_dir:   $spool_dir\n");
-         diag("config_dir:   $config_dir\n");
-         diag("sendmail_dir: $sendmail_dir\n");
-     }
-}
+
 
 # We're going to use create mime message to create these messages, and
 # then just send them to receive.
@@ -126,7 +120,7 @@ ok($status->{severity} eq 'wishlist','bug 1 wishlisted');
 my @control_commands =
      (
       clone        => {command => 'clone',
-                      value   => '-1',
+                      value   => '1 -1',
                       status_key => 'package',
                       status_value => 'foo',
                       bug          => '2',
@@ -137,7 +131,7 @@ my @control_commands =
                       status_value => '2',
                      },
       unmerge      => {command => 'unmerge',
-                      value   => '',
+                      value   => '1',
                       status_key => 'mergedwith',
                       status_value => '',
                      },
@@ -152,7 +146,7 @@ send_message(to => 'control@bugs.something',
                        ],
             body => <<'EOF') or fail 'message to control@bugs.something failed';
 debug 10
-clone 2 -1 -2 -3 -4
+clone 2 -1 -2 -3 -4 -5 -6
 retitle 2 foo
 owner 2 bar@baz.com
 submitter 2 fleb@bleh.com
@@ -167,6 +161,8 @@ close 2
 tag -3 wontfix
 fixed -4 1.2-3
 found -4 1.2-1
+found -5 1.2-5
+fixed -5 1.2-6
 thanks
 EOF
        ;
@@ -177,25 +173,31 @@ EOF
 
 
 test_control_commands(forcemerge   => {command => 'forcemerge',
-                                      value   => '2',
+                                      value   => '1 2',
                                       status_key => 'mergedwith',
                                       status_value => '2',
                                      },
                      unmerge      => {command => 'unmerge',
-                                      value   => '',
+                                      value   => '1',
                                       status_key => 'mergedwith',
                                       status_value => '',
                                      },
                      forcemerge   => {command => 'forcemerge',
-                                      value   => '2 5',
+                                      value   => '1 2 5',
                                       status_key => 'mergedwith',
                                       status_value => '2 5',
                                      },
                      forcemerge   => {command => 'forcemerge',
-                                      value   => '2 6',
+                                      value   => '1 2 6',
                                       status_key => 'mergedwith',
                                       status_value => '2 5 6',
                                      },
+                     merge        => {command => 'merge',
+                                      value   => '7 8',
+                                      status_key => 'mergedwith',
+                                      status_value => '8',
+                                      bug => '7',
+                                     },
                     );
 
 
@@ -213,7 +215,7 @@ sub test_control_commands{
                                ],
                     body => <<EOF) or fail 'message to control@bugs.something failed';
 debug 10
-$control_command->{command} 1$control_command->{value}
+$control_command->{command} $control_command->{value}
 thanks
 EOF
        ;