summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-08-13 10:29:26 +0200
committerChristian Brabandt <cb@256bit.org>2023-08-13 10:31:27 +0200
commit9c30f4389944810cf88154d25dfd9ea5737c19e6 (patch)
tree4e5000e5c71d2f6176b461b115cc64967c7731b9
parent2f339aad6c80e82d7c1237b402392065857174d4 (diff)
patch 9.0.1702: Undo test is flakyv9.0.1702
Problem: Undo test is flaky. Solution: Apply filter and change time to "1 second ago" in both dumps. closes: #12771 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: zeertzjq <zeertzjq@outlook.com>
-rw-r--r--src/testdir/dumps/Test_undo_after_write_1.vim2
-rw-r--r--src/testdir/dumps/Test_undo_after_write_2.vim4
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/dumps/Test_undo_after_write_1.vim b/src/testdir/dumps/Test_undo_after_write_1.vim
new file mode 100644
index 0000000000..62e02b338f
--- /dev/null
+++ b/src/testdir/dumps/Test_undo_after_write_1.vim
@@ -0,0 +1,2 @@
+" Filter that changes undo time message to "1 second ago".
+6s+|\d| |s|e|c|o|n|d|s| |a|g|o| @19|+|1| |s|e|c|o|n|d| |a|g|o| @20|+e
diff --git a/src/testdir/dumps/Test_undo_after_write_2.vim b/src/testdir/dumps/Test_undo_after_write_2.vim
index d1d3c3d48d..b99f232048 100644
--- a/src/testdir/dumps/Test_undo_after_write_2.vim
+++ b/src/testdir/dumps/Test_undo_after_write_2.vim
@@ -1,2 +1,2 @@
-" Filter that changes the "1 second ago" message to "0 seconds ago".
-6s+|1| |s|e|c|o|n|d| |a|g|o| @18|+|0| |s|e|c|o|n|d|s| |a|g|o| @17|+e
+" Filter that changes undo time message to "1 second ago".
+6s+|\d| |s|e|c|o|n|d|s| |a|g|o| @17|+|1| |s|e|c|o|n|d| |a|g|o| @18|+e
diff --git a/src/version.c b/src/version.c
index ddae454031..fc6621fa50 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1702,
+/**/
1701,
/**/
1700,