[DRE-commits] [SCM] ruby-highline.git branch, master, updated. debian/1.6.13-2-14-gf5406b6

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit e917d0535edfb87786a3b92d28d524e9f211588a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jun 28 08:10:27 2013 +0200

    disable test_terminal_size

diff --git a/debian/changelog b/debian/changelog
index 9d2d1ba..8ffdda0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ ruby-highline (1.6.19-1) UNRELEASED; urgency=low
   * set external encoding when needed for tests
   * update my email address and years in debian/copyright
   * remove lintian-overrides, about transitional packages
+  * add disable_test_terminal_size.patch: disable a failing test with
+    pbuilder/sbuild.
 
  -- Cédric Boutillier <boutil at debian.org>  Thu, 27 Jun 2013 23:30:42 +0200
 
diff --git a/debian/patches/disable_test_terminal_size.patch b/debian/patches/disable_test_terminal_size.patch
new file mode 100644
index 0000000..9e95b5e
--- /dev/null
+++ b/debian/patches/disable_test_terminal_size.patch
@@ -0,0 +1,18 @@
+Description: disable test_terminal_size
+ In pbuilder/sbuild, stty size returns an empty string and thus :terminal_size
+ returns nil values. This test is thus failing.
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Bug: https://github.com/JEG2/highline/issues/85
+Last-Update: 2013-06-28
+--- a/test/tc_highline.rb
++++ b/test/tc_highline.rb
+@@ -929,7 +929,7 @@
+     assert_equal("\e[32mThis will have a newline.\e[0m\n", @output.string)
+   end
+ 
+-  def test_terminal_size
++  def _test_terminal_size
+     assert_instance_of(Fixnum, @terminal.terminal_size[0])
+     assert_instance_of(Fixnum, @terminal.terminal_size[1])
+   end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4273b90
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_test_terminal_size.patch

-- 
ruby-highline.git