aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.1166

Browse Source 
Problem:    Loading Python modules is not tested.
Solution:   Enable commented-out tests, add missing files. (ZyX)
This commit is contained in:
Bram Moolenaar
2013-06-11 18:48:21 +02:00
parent 16619a235b
commit a9f2220176
11 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -42,6 +42,7 @@ gvimext.lib
*.mo *.mo
*.swp *.swp
*~ *~
*.pyc
src/po/vim.pot src/po/vim.pot
# Generated by "make test" # Generated by "make test"

3
Filelist
View File

@@ -84,6 +84,9 @@ SRC_ALL = \
src/testdir/test49.vim \ src/testdir/test49.vim \
src/testdir/test60.vim \ src/testdir/test60.vim \
src/testdir/test83-tags? \ src/testdir/test83-tags? \
src/testdir/python2/*.py \
src/testdir/python3/*.py \
src/testdir/pythonx/*.py \
src/proto.h \ src/proto.h \
src/proto/blowfish.pro \ src/proto/blowfish.pro \
src/proto/buffer.pro \ src/proto/buffer.pro \

1
src/testdir/python2/module.py Normal file
View File

@@ -0,0 +1 @@
dir = '2'

1
src/testdir/python3/module.py Normal file
View File

@@ -0,0 +1 @@
dir = '3'

1
src/testdir/pythonx/module.py Normal file
View File

@@ -0,0 +1 @@
dir = 'x'

1
src/testdir/pythonx/modulex.py Normal file
View File

@@ -0,0 +1 @@
ddir = 'xx'

14
src/testdir/test86.in
View File

@@ -1069,13 +1069,13 @@ ee('vim.current.tabpage = True')
ee('vim.current.xxx = True') ee('vim.current.xxx = True')
EOF EOF
:" :"
:" Test import TODO: BROKEN :" Test import
:"py << EOF py << EOF
:"vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\') vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
:"from module import dir as d from module import dir as d
:"from modulex import ddir from modulex import ddir
:"cb.append(d + ',' + ddir) cb.append(d + ',' + ddir)
:"EOF EOF
:" :"
:" Test exceptions :" Test exceptions
:fun Exe(e) :fun Exe(e)

1
src/testdir/test86.ok
View File

@@ -1083,6 +1083,7 @@ vim.current.buffer = True:(<type 'exceptions.TypeError'>, TypeError('expected vi
vim.current.window = True:(<type 'exceptions.TypeError'>, TypeError('expected vim.Window object',)) vim.current.window = True:(<type 'exceptions.TypeError'>, TypeError('expected vim.Window object',))
vim.current.tabpage = True:(<type 'exceptions.TypeError'>, TypeError('expected vim.TabPage object',)) vim.current.tabpage = True:(<type 'exceptions.TypeError'>, TypeError('expected vim.TabPage object',))
vim.current.xxx = True:(<type 'exceptions.AttributeError'>, AttributeError('xxx',)) vim.current.xxx = True:(<type 'exceptions.AttributeError'>, AttributeError('xxx',))
2,xx
vim.command("throw 'abc'"):(<class 'vim.error'>, error('abc',)) vim.command("throw 'abc'"):(<class 'vim.error'>, error('abc',))
Exe("throw 'def'"):(<class 'vim.error'>, error('def',)) Exe("throw 'def'"):(<class 'vim.error'>, error('def',))
vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',)) vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',))

14
src/testdir/test87.in
View File

@@ -1036,13 +1036,13 @@ ee('vim.current.tabpage = True')
ee('vim.current.xxx = True') ee('vim.current.xxx = True')
EOF EOF
:" :"
:" Test import TODO: BROKEN :" Test import
:"py3 << EOF py3 << EOF
:"vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\') vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
:"from module import dir as d from module import dir as d
:"from modulex import ddir from modulex import ddir
:"cb.append(d + ',' + ddir) cb.append(d + ',' + ddir)
:"EOF EOF
:" :"
:" Test exceptions :" Test exceptions
:fun Exe(e) :fun Exe(e)

1
src/testdir/test87.ok
View File

@@ -1092,6 +1092,7 @@ vim.current.buffer = True:(<class 'TypeError'>, TypeError('expected vim.Buffer o
vim.current.window = True:(<class 'TypeError'>, TypeError('expected vim.Window object',)) vim.current.window = True:(<class 'TypeError'>, TypeError('expected vim.Window object',))
vim.current.tabpage = True:(<class 'TypeError'>, TypeError('expected vim.TabPage object',)) vim.current.tabpage = True:(<class 'TypeError'>, TypeError('expected vim.TabPage object',))
vim.current.xxx = True:(<class 'AttributeError'>, AttributeError('xxx',)) vim.current.xxx = True:(<class 'AttributeError'>, AttributeError('xxx',))
3,xx
vim.command("throw 'abc'"):(<class 'vim.error'>, error('abc',)) vim.command("throw 'abc'"):(<class 'vim.error'>, error('abc',))
Exe("throw 'def'"):(<class 'vim.error'>, error('def',)) Exe("throw 'def'"):(<class 'vim.error'>, error('def',))
vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',)) vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',))

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1166,
/**/ /**/
1165, 1165,
/**/ /**/