[Python-modules-commits] [python-blessed] 02/02: merge patched into master

[Pierre-Elliott Bécue]

This is an automated email from the git hooks/post-receive script.

peb-guest pushed a commit to branch master
in repository python-blessed.

commit 1f32279278066613d8526de9cef276f6fc5a021f
Merge: 7aa355a f7be719
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Tue Jan 2 19:00:50 2018 +0100

    merge patched into master

 blessed/tests/test_keyboard.py                     |  4 --
 debian/.git-dpm                                    |  4 +-
 ...-time-based-assertion-when-timeout-is-0-i.patch | 26 ----------
 ...-time-based-assertion-in-test_keyboard.py.patch | 58 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 5 files changed, 61 insertions(+), 33 deletions(-)

diff --cc debian/.git-dpm
index 2aa646c,0000000..ffe1e9a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 82a0e807c403b62d9efe17766d04c47e6c3ccbe3
- 82a0e807c403b62d9efe17766d04c47e6c3ccbe3
++f7be7193a7e6722b332f074de8db2c9f233f0d20
++f7be7193a7e6722b332f074de8db2c9f233f0d20
 +9cf4b2b68909af9ef45a3cc7689f9f3995b0aefa
 +9cf4b2b68909af9ef45a3cc7689f9f3995b0aefa
 +python-blessed_1.14.2.orig.tar.gz
 +b21cb37a5bcf9278d040c1da43e7e5cc6252ef39
 +82942
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removes-time-based-assertion-in-test_keyboard.py.patch
index 0000000,0000000..b7509ee
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Removes-time-based-assertion-in-test_keyboard.py.patch
@@@ -1,0 -1,0 +1,58 @@@
++From f7be7193a7e6722b332f074de8db2c9f233f0d20 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++Date: Sun, 31 Dec 2017 13:12:44 +0100
++Subject: Removes time based assertion in test_keyboard.py
++
++ * Expecting the duration time for the tests to be bound between times
++   at a millisecond precision is too much hardware-dependant, and so
++   irrelevant for real conditions testing. The previous assertion
++   expects that the test takes less than 1 or 2 second which is really
++   reasonable.
++---
++ blessed/tests/test_keyboard.py | 5 -----
++ 1 file changed, 5 deletions(-)
++
++diff --git a/blessed/tests/test_keyboard.py b/blessed/tests/test_keyboard.py
++index 9df528d..9b63f94 100644
++--- a/blessed/tests/test_keyboard.py
+++++ b/blessed/tests/test_keyboard.py
++@@ -459,7 +459,6 @@ def test_esc_delay_cbreak_035():
++     assert key_name == u'KEY_ESCAPE'
++     assert os.WEXITSTATUS(status) == 0
++     assert math.floor(time.time() - stime) == 0.0
++-    assert 34 <= int(duration_ms) <= 45, duration_ms
++ 
++ 
++ @pytest.mark.skipif(os.environ.get('TEST_QUICK', None) is not None,
++@@ -493,7 +492,6 @@ def test_esc_delay_cbreak_135():
++     assert key_name == u'KEY_ESCAPE'
++     assert os.WEXITSTATUS(status) == 0
++     assert math.floor(time.time() - stime) == 1.0
++-    assert 134 <= int(duration_ms) <= 145, int(duration_ms)
++ 
++ 
++ def test_esc_delay_cbreak_timout_0():
++@@ -525,7 +523,6 @@ def test_esc_delay_cbreak_timout_0():
++     assert key_name == u'KEY_ESCAPE'
++     assert os.WEXITSTATUS(status) == 0
++     assert math.floor(time.time() - stime) == 0.0
++-    assert 34 <= int(duration_ms) <= 45, int(duration_ms)
++ 
++ 
++ def test_esc_delay_cbreak_nonprefix_sequence():
++@@ -559,7 +556,6 @@ def test_esc_delay_cbreak_nonprefix_sequence():
++     assert key2 == u'a'
++     assert os.WEXITSTATUS(status) == 0
++     assert math.floor(time.time() - stime) == 0.0
++-    assert -1 <= int(duration_ms) <= 15, duration_ms
++ 
++ 
++ def test_esc_delay_cbreak_prefix_sequence():
++@@ -593,7 +589,6 @@ def test_esc_delay_cbreak_prefix_sequence():
++     assert key2 == u'['
++     assert os.WEXITSTATUS(status) == 0
++     assert math.floor(time.time() - stime) == 0.0
++-    assert 34 <= int(duration_ms) <= 45, duration_ms
++ 
++ 
++ def test_get_location_0s():
diff --cc debian/patches/series
index 8a70286,0000000..6a5cab9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-Removes-the-time-based-assertion-when-timeout-is-0-i.patch
++0001-Removes-time-based-assertion-in-test_keyboard.py.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-blessed.git