[DRE-commits] [SCM] ruby-rubymail.git branch, master, updated. debian/0.17-1.1-23-g6d4e146

[Per Andersson]

The following commit has been merged in the master branch:
commit b7f841a8b23d508c4d0643e064e396bcb41f1cce
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Jun 7 20:18:26 2012 +0200

    Add patch for testing header params without order guarantee.

diff --git a/debian/changelog b/debian/changelog
index 808b9e4..3bbff0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ruby-rubymail (1.0.0-1) UNRELEASED; urgency=low
   * Add patch to remove rubygems require. Closes: #431557
   * Add watch file.
   * Change doc-base section to Programming/Ruby.
+  * Add patch for testing header params without order guarantee.
 
  -- Per Andersson <avtobiff at gmail.com>  Wed, 06 Jun 2012 19:57:13 +0200
 
diff --git a/debian/patches/0006-Test-header-params-without-order-guarantee.patch b/debian/patches/0006-Test-header-params-without-order-guarantee.patch
new file mode 100644
index 0000000..d87af57
--- /dev/null
+++ b/debian/patches/0006-Test-header-params-without-order-guarantee.patch
@@ -0,0 +1,27 @@
+From: Per Andersson <avtobiff at gmail.com>
+Date: Thu, 7 Jun 2012 19:37:41 +0200
+Subject: Test header params without order guarantee.
+
+---
+ test/testheader.rb |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/test/testheader.rb b/test/testheader.rb
+index 3c759dc..3e03b08 100644
+--- a/test/testheader.rb
++++ b/test/testheader.rb
+@@ -209,7 +209,12 @@ class TestRMailHeader < TestBase
+     # Test the params argument
+     h = RMail::Header.new
+     h.add("name", "value", nil, 'param1' => 'value1', 'param2' => '+value2')
+-    assert_equal('value; param1=value1; param2="+value2"', h['name'])
++    # Param order can not be guaranteed since they are given as dict to the
++    # function.
++    #assert_equal('value; param1=value1; param2="+value2"', h['name'])
++    header_check = (h['name'] == 'value; param1=value1; param2="+value2"' or
++                    h['name'] == 'value; param2="+value2"; param1=value1')
++    assert(header_check)
+ 
+     h = RMail::Header.new
+     h.add_raw("MIME-Version: 1.0")
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index fe982d3..88b4afc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Implement-compatibility-wrapper-for-retrieving-test-.patch
 0004-Parse-messages-with-r-n-as-linefeed.patch
 0005-Patch-out-require-rubygems.patch
+0006-Test-header-params-without-order-guarantee.patch

-- 
ruby-rubymail.git