Mercurial > vim

changeset 7984:c166ff6797cb v7.4.1287

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/74f5e65bcc3d77ab879f56eb977f5038edccbcf8 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 7 21:44:49 2016 +0100 patch 7.4.1287 Problem: Channel test fails. Solution: Use reltimefloat().
author Christian Brabandt <cb@256bit.org>
date Sun, 07 Feb 2016 21:45:04 +0100
parents e8ec58a726a3
children fd76e567bf86
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -187,7 +187,7 @@ func Test_connect_waittime()
     call ch_close(handle)
   else
     let elapsed = reltime(start)
-    call assert_true(elapsed < 1.0)
+    call assert_true(reltimefloat(elapsed) < 1.0)
   endif
 
   let start = reltime()
@@ -198,6 +198,6 @@ func Test_connect_waittime()
   else
     " Failed connection doesn't wait the full time.
     let elapsed = reltime(start)
-    call assert_true(elapsed < 1.0)
+    call assert_true(reltimefloat(elapsed) < 1.0)
   endif
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1287,
+/**/
     1286,
 /**/
     1285,