Skip to content

Commit 32f6a72

Browse files
authored
Merge pull request #110 from blueyed/v8.1.0129
tests: use Vim v8.1.0129 to work around Vim bug
2 parents 64306e4 + e30eaac commit 32f6a72

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
common: &common
44
working_directory: ~/repo
55
docker:
6-
- image: blueyed/vim-python-pep8-indent-vims-for-test:2@sha256:a7be5f4d07ed361ce3ca78cedd413d67d583f96ab0a59feb512af89052c50172
6+
- image: blueyed/vim-python-pep8-indent-vims-for-test:3@sha256:e7e3c4f4b021954a40f2f1d88dc470f119dc65603c63724d1c58cbe437fdc2d4
77

88
jobs:
99
test:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM testbed/vim:latest
22

33
RUN apk --no-cache add gtk+2.0-dev libx11-dev libxt-dev mcookie xauth xvfb
44
# NOTE: +profile needs huge features.
5-
RUN install_vim -tag master --with-features=huge \
5+
RUN install_vim -tag v8.1.0129 -name vim --with-features=huge \
66
--disable-channel --disable-netbeans --disable-xim \
77
--enable-gui=gtk2 --with-x -build
8-
RUN ln -s /vim-build/bin/vim-master /usr/bin/gvim
8+
RUN ln -s /vim-build/bin/vim /usr/bin/gvim
99
RUN gvim --version
1010

1111
# Install covimerage and vint.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ test:
33

44
# Run tests in dockerized Vims.
55
DOCKER_REPO:=blueyed/vim-python-pep8-indent-vims-for-test
6-
DOCKER_TAG:=2
6+
DOCKER_TAG:=3
77
DOCKER_IMAGE:=$(DOCKER_REPO):$(DOCKER_TAG)
88

99
docker_image:

spec/indent/cython_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
before(:all) {
55
vim.command "new"
66
vim.command "set ft=cython"
7-
# vim.command("set indentexpr?").should include "GetPythonPEPIndent("
7+
vim.command("set indentexpr?").should include "GetPythonPEPIndent("
88
}
99
before(:each) {
10+
# clear buffer
11+
vim.normal 'gg"_dG'
12+
1013
# Insert two blank lines.
1114
# The first line is a corner case in this plugin that would shadow the
1215
# correct behaviour of other tests. Thus we explicitly jump to the first

0 commit comments

Comments
 (0)