[Python-apps-commits] r14262 - in packages/khal/trunk/debian (2 files)

[fpytloun-guest at users.alioth.debian.org]

    Date: Wednesday, July 19, 2017 @ 10:02:42
  Author: fpytloun-guest
Revision: 14262

Fix patch that workarounds stdin input

Modified:
  packages/khal/trunk/debian/changelog
  packages/khal/trunk/debian/patches/0007-Workaround-test-of-stdin-input.patch

Modified: packages/khal/trunk/debian/changelog
===================================================================
--- packages/khal/trunk/debian/changelog	2017-07-19 08:17:53 UTC (rev 14261)
+++ packages/khal/trunk/debian/changelog	2017-07-19 10:02:42 UTC (rev 14262)
@@ -2,6 +2,7 @@
 
   * Fix FTBFS by marking test that requires stdin as xfail,
     Upstream bug: https://github.com/pimutils/khal/issues/683
+    (Closes: #868773)
 
  -- Filip Pytloun <filip at pytloun.cz>  Tue, 18 Jul 2017 22:51:30 +0200
 

Modified: packages/khal/trunk/debian/patches/0007-Workaround-test-of-stdin-input.patch
===================================================================
--- packages/khal/trunk/debian/patches/0007-Workaround-test-of-stdin-input.patch	2017-07-19 08:17:53 UTC (rev 14261)
+++ packages/khal/trunk/debian/patches/0007-Workaround-test-of-stdin-input.patch	2017-07-19 10:02:42 UTC (rev 14262)
@@ -1,14 +1,14 @@
-From e59bab26acfea2bcb2acc0d442e2ecbd1119dce5 Mon Sep 17 00:00:00 2001
+From fa15c88cf67ab860b3f60761dea11b39b53d980a Mon Sep 17 00:00:00 2001
 From: Filip Pytloun <filip at pytloun.cz>
 Date: Tue, 18 Jul 2017 22:50:57 +0200
 Subject: [PATCH 7/7] Workaround test of stdin input
 
 ---
- tests/cli_test.py | 1 +
- 1 file changed, 1 insertion(+)
+ tests/cli_test.py | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/tests/cli_test.py b/tests/cli_test.py
-index 9c98899..457949c 100644
+index 9c98899..140455e 100644
 --- a/tests/cli_test.py
 +++ b/tests/cli_test.py
 @@ -495,6 +495,7 @@ def test_import_invalid_choice_and_prefix(runner):
@@ -19,6 +19,14 @@
  def test_import_from_stdin(runner):
      ics_data = 'This is some really fake icalendar data'
  
+@@ -677,6 +678,7 @@ def test_print_ics_command(runner):
+     assert 24 == len(result.output.split('\t'))
+ 
+ 
++ at pytest.mark.xfail
+ def test_printics_read_from_stdin(runner):
+     runner = runner(command='printics')
+     result = runner.invoke(main_khal, ['printics'], input=_get_text('cal_d'))
 -- 
 2.11.0