To: vim_dev@googlegroups.com
Subject: Patch 7.4.1540
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.1540
Problem:    Channel test is a bit flaky.
Solution:   Increase expected wait time.
Files:      src/testdir/test_channel.vim


*** ../vim-7.4.1539/src/testdir/test_channel.vim	2016-03-11 22:19:39.934894037 +0100
--- src/testdir/test_channel.vim	2016-03-12 13:46:42.186481445 +0100
***************
*** 442,451 ****
        " Oops, port does exists.
        call ch_close(handle)
      else
!       " Failed connection should wait about 500 msec.
        let elapsed = reltime(start)
        call assert_true(reltimefloat(elapsed) > 0.3)
!       call assert_true(reltimefloat(elapsed) < 1.0)
      endif
    catch
      if v:exception !~ 'Connection reset by peer'
--- 442,452 ----
        " Oops, port does exists.
        call ch_close(handle)
      else
!       " Failed connection should wait about 500 msec.  Can be longer if the
!       " computer is busy with other things.
        let elapsed = reltime(start)
        call assert_true(reltimefloat(elapsed) > 0.3)
!       call assert_true(reltimefloat(elapsed) < 1.5)
      endif
    catch
      if v:exception !~ 'Connection reset by peer'
*** ../vim-7.4.1539/src/version.c	2016-03-12 13:43:28.864478188 +0100
--- src/version.c	2016-03-12 13:47:46.909812940 +0100
***************
*** 745,746 ****
--- 745,748 ----
  {   /* Add new patch number below this line */
+ /**/
+     1540,
  /**/

-- 
In many of the more relaxed civilizations on the Outer Eastern Rim of the
Galaxy, "The Hitchhiker's Guide to the Galaxy" has already supplanted the
great "Encyclopedia Galactica" as the standard repository of all knowledge
and wisdom, for though it has many omissions and contains much that is
apocryphal, or at least wildly inaccurate, it scores over the older, more
pedestrian work in two important respects.
First, it is slightly cheaper; and second, it has the words "DON'T PANIC"
inscribed in large friendly letters on its cover.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///