From 8c999a9d6cbf892d66900ee626a3600ddc7d9849 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Fri, 15 May 2015 19:03:48 +0200 Subject: tests: Migrate legacy test 61. This test is real time based as it also tests the `:earlier` and `:later` commands with time arguments (using `:sleep`). This can sometimes case the test to fail on systems that are under heavy load or where the time interval between creating the expected buffer state and the `:earlier` or `:later` command that tries to jump to it changes. To be system independent we use nvim's `:sleep` command and `wait()` for it in the test suit. The legacy vim test writes to test.out a lot with `:.w >>test.out`. This does currently not work in the lua test suite so the test is modernized to use busted's assertions instead of the output file. This test was treated special in the legacy Makefile but after the conversion the related code can be removed. --- src/nvim/testdir/Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index b982dbcbb3..da99c6d1c4 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -19,7 +19,7 @@ SCRIPTS := test_eval.out \ test46.out test47.out test48.out test49.out \ test52.out test53.out test55.out \ test57.out test58.out test59.out \ - test61.out test62.out test63.out test64.out \ + test62.out test63.out test64.out \ test68.out test69.out \ test71.out test73.out \ test79.out test80.out \ @@ -126,15 +126,6 @@ test1.out: .gdbinit test1.in @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" $(RUN_VIM) $*.in - # For flaky tests retry one time. - @/bin/sh -c "if test -f test.out -a $* = test61; then \ - if diff test.out $*.ok; then \ - echo flaky test ok first time; \ - else rm -rf $*.failed $(RM_ON_RUN); \ - $(RUN_VIM) $*.in; \ - fi; \ - fi" - # Check if the test.out file matches test.ok. @/bin/sh -c "if test -f test.out; then \ if diff test.out $*.ok; then \ -- cgit