From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 4 Dec 2017 22:07:39 +0000 (-0800)
Subject: modify merge tests to test merging blocking bugs
X-Git-Tag: release/2.6.0~55
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=302a2d0396cfa4e7dbdfca6fc3039954a036e25b

modify merge tests to test merging blocking bugs
---

diff --git a/t/12_merge.t b/t/12_merge.t
index e420ae3..a20b397 100644
--- a/t/12_merge.t
+++ b/t/12_merge.t
@@ -164,14 +164,16 @@ EOF
 
 test_control_commands(\%config,
 		      forcemerge   => {command => 'forcemerge',
-				       value   => '1 2',
+				       value   => "2 3\nseverity 2 minor",
 				       status_key => 'mergedwith',
-				       status_value => '2',
+				       status_value => '3',
+				       bug => 2,
 				      },
 		      unmerge      => {command => 'unmerge',
-				       value   => '1',
+				       value   => '2',
 				       status_key => 'mergedwith',
 				       status_value => '',
+				       bug => 2,
 				      },
 		      forcemerge   => {command => 'forcemerge',
 				       value   => '1 2 5',