Skip to content

Commit 8a6cdf4

Browse files
committed
Merge pull request #139 from bfredl/testfix
tests: Update tests to neovim changes
2 parents 63f9053 + 0dce6a8 commit 8a6cdf4

File tree

3 files changed

+5
-26
lines changed

3 files changed

+5
-26
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ python:
1919
# at the bottom of .scrutinizer.yml.
2020
- 2.6
2121
- 2.7
22-
- 3.2
2322
- 3.3
2423
- 3.4
24+
- 3.5
2525
- pypy
2626
before_install:
2727
- if [ $CI_TARGET = tests ]; then

test/test_buffer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ def test_append():
123123
vim.current.buffer.append('a')
124124
eq(vim.current.buffer[:], ['', 'a'])
125125
vim.current.buffer.append('b', 0)
126-
eq(vim.current.buffer[:], ['', 'b', 'a'])
126+
eq(vim.current.buffer[:], ['b', '', 'a'])
127127
vim.current.buffer.append(['c', 'd'])
128-
eq(vim.current.buffer[:], ['', 'b', 'a', 'c', 'd'])
128+
eq(vim.current.buffer[:], ['b', '', 'a', 'c', 'd'])
129129
vim.current.buffer.append(['c', 'd'], 2)
130-
eq(vim.current.buffer[:], ['', 'b', 'a', 'c', 'd', 'c', 'd'])
130+
eq(vim.current.buffer[:], ['b', '', 'c', 'd', 'a', 'c', 'd'])
131131

132132

133133
@with_setup(setup=cleanup)

test/test_vim.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,6 @@ def test_strwidth():
5454
# 19 * 2 (each japanese character occupies two cells)
5555
eq(vim.strwidth('neovimのデザインかなりまともなのになってる。'), 44)
5656

57-
58-
@with_setup(setup=cleanup)
59-
def test_list_runtime_paths():
60-
# Is this the default runtime path list?
61-
homedir = os.path.join(os.environ['HOME'], '.nvim')
62-
vimdir = vim.eval('$VIM')
63-
dflt_rtp = [
64-
homedir,
65-
os.path.join(vimdir, 'vimfiles'),
66-
vimdir,
67-
os.path.join(vimdir, 'vimfiles', 'after')
68-
]
69-
# If the runtime is installed the default path
70-
# is nvim/runtime
71-
dflt_rtp2 = list(dflt_rtp)
72-
dflt_rtp2[2] = os.path.join(dflt_rtp2[2], 'runtime')
73-
74-
rtp = vim.list_runtime_paths()
75-
ok(rtp == dflt_rtp or rtp == dflt_rtp2)
76-
77-
7857
@with_setup(setup=cleanup)
7958
def test_chdir():
8059
pwd = vim.eval('getcwd()')
@@ -100,7 +79,7 @@ def test_vars():
10079

10180
@with_setup(setup=cleanup)
10281
def test_options():
103-
eq(vim.options['listchars'], 'eol:$')
82+
eq(vim.options['listchars'], 'tab:> ,trail:-,nbsp:+')
10483
vim.options['listchars'] = 'tab:xy'
10584
eq(vim.options['listchars'], 'tab:xy')
10685

0 commit comments

Comments
 (0)