Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make pytest run doctests as well #29

Closed
wants to merge 9 commits into from
Closed

Make pytest run doctests as well #29

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
823d5b7
Make :Pytest capture doctests as wel
fabianvf Sep 15, 2015
51006d6
add doctest testing functionality for functions
fabianvf Sep 16, 2015
26e2c6c
add support for files
fabianvf Sep 16, 2015
f364cda
Add (I think?) support for projects
fabianvf Sep 16, 2015
0fbc5fe
Whoops, typo
fabianvf Sep 16, 2015
e4f3655
Abstract the python path logic, get class doctests working
fabianvf Sep 16, 2015
7c099df
add support for methods
fabianvf Sep 16, 2015
2e32228
add missing endif
fabianvf Sep 16, 2015
464297a
fix the parameter order for s:RunPyTest
fabianvf Sep 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 67 additions & 32 deletions ftplugin/python/pytest.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,15 @@ function! s:NameOfCurrentClass()
endfunction


function! s:PythonPathToModule()
let path = @%
let path = substitute(path, '.__init__.py', '.', 'g')
let path = substitute(path, '.py', '.', 'g')
let path = substitute(path, '/', '.', 'g')
return path
endfunction


function! s:NameOfCurrentMethod()
normal! $<cr>
let find_object = s:FindPythonObject('method')
Expand Down Expand Up @@ -343,8 +352,13 @@ function! s:ProjectPath()
endfunction


function! s:RunInSplitWindow(path)
let cmd = "py.test --tb=short " . a:path
function! s:RunInSplitWindow(path, doctest)
let cmd = "py.test"
if (a:doctest == 'True')
let cmd = cmd . ' --doctest-modules'
endif
let cmd = cmd . " --tb=short " . a:path

if exists("g:ConqueTerm_Loaded")
call conque_term#open(cmd, ['split', 'resize 20'], 0)
else
Expand Down Expand Up @@ -548,7 +562,7 @@ function! s:ResetAll()
endfunction!


function! s:RunPyTest(path, ...)
function! s:RunPyTest(path, doctest, ...)
if (a:0 > 0)
let parametrized = a:1
else
Expand All @@ -557,10 +571,14 @@ function! s:RunPyTest(path, ...)

let g:pytest_last_session = ""

let cmd = 'py.test'
if (a:doctest == 'True')
let cmd = cmd . ' --doctest-modules'

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is missing an endif

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops!

if (len(parametrized) && parametrized != "0")
let cmd = "py.test -k " . parametrized . " --tb=short " . a:path
let cmd = cmd . " -k " . parametrized . " --tb=short " . a:path
else
let cmd = "py.test --tb=short " . a:path
let cmd = cmd . " --tb=short " . a:path
endif

let out = system(cmd)
Expand Down Expand Up @@ -797,14 +815,20 @@ function! s:GreenBar()
endfunction


function! s:ThisMethod(verbose, ...)
function! s:ThisMethod(verbose, doctest, ...)
let save_cursor = getpos('.')
call s:ClearAll()
let sep = '::'
let m_name = s:NameOfCurrentMethod()
let is_parametrized = s:HasPythonDecorator(line('.'))

let c_name = s:NameOfCurrentClass()
if (a:doctest == 'True')
let c_name = s:PythonPathToModule() . c_name
let sep = '.'
endif
let abspath = s:CurrentPath()

if (strlen(m_name) == 1)
call setpos('.', save_cursor)
call s:Echo("Unable to find a matching method for testing")
Expand All @@ -824,7 +848,7 @@ function! s:ThisMethod(verbose, ...)
let parametrized_flag = m_name
let message = "py.test ==> Running test for parametrized method " . m_name
else
let path = abspath . "::" . c_name . "::" . m_name
let path = abspath . "::" . c_name . sep . m_name
let parametrized_flag = "0"
let message = "py.test ==> Running test for method " . m_name
endif
Expand All @@ -839,9 +863,9 @@ function! s:ThisMethod(verbose, ...)
return
endif
if (a:verbose == 1)
call s:RunInSplitWindow(path)
call s:RunInSplitWindow(path, a:doctest)
else
call s:RunPyTest(path, parametrized_flag)
call s:RunPyTest(path, a:doctest, parametrized_flag)
endif
endfunction

Expand Down Expand Up @@ -873,10 +897,14 @@ function! s:HasPythonDecorator(line)
endfunction


function! s:ThisFunction(verbose, ...)
function! s:ThisFunction(verbose, doctest, ...)
let save_cursor = getpos('.')
call s:ClearAll()
let c_name = s:NameOfCurrentFunction()
if (a:doctest == 'True')
let c_name = s:PythonPathToModule() . c_name
endif

let is_parametrized = s:HasPythonDecorator(line('.'))
let abspath = s:CurrentPath()
if (strlen(c_name) == 1)
Expand Down Expand Up @@ -904,17 +932,20 @@ function! s:ThisFunction(verbose, ...)
endif

if (a:verbose == 1)
call s:RunInSplitWindow(path)
call s:RunInSplitWindow(path, a:doctest)
else
call s:RunPyTest(path, c_name)
call s:RunPyTest(path, c_name, a:doctest)
endif
endfunction


function! s:ThisClass(verbose, ...)
function! s:ThisClass(verbose, doctest, ...)
let save_cursor = getpos('.')
call s:ClearAll()
let c_name = s:NameOfCurrentClass()
if (a:doctest == 'True')
let c_name = s:PythonPathToModule() . c_name
endif
let abspath = s:CurrentPath()
if (strlen(c_name) == 1)
call setpos('.', save_cursor)
Expand All @@ -936,14 +967,14 @@ function! s:ThisClass(verbose, ...)
endif

if (a:verbose == 1)
call s:RunInSplitWindow(path)
call s:RunInSplitWindow(path, a:doctest)
else
call s:RunPyTest(path)
call s:RunPyTest(path, a:doctest)
endif
endfunction


function! s:ThisFile(verbose, ...)
function! s:ThisFile(verbose, doctest, ...)
call s:ClearAll()
let message = "py.test ==> Running tests for entire file"
call s:Echo(message, 1)
Expand All @@ -959,13 +990,13 @@ function! s:ThisFile(verbose, ...)
endif

if (a:verbose == 1)
call s:RunInSplitWindow(abspath)
call s:RunInSplitWindow(abspath, a:doctest)
else
call s:RunPyTest(abspath)
call s:RunPyTest(abspath, a:doctest)
endif
endfunction

function! s:ThisProject(verbose, ...)
function! s:ThisProject(verbose, doctest, ...)
call s:ClearAll()
let message = "py.test ==> Running tests for entire project"
call s:Echo(message, 1)
Expand All @@ -982,15 +1013,15 @@ function! s:ThisProject(verbose, ...)
endif

if (a:verbose == 1)
call s:RunInSplitWindow(abspath)
call s:RunInSplitWindow(abspath, a:doctest)
else
call s:RunPyTest(abspath)
call s:RunPyTest(abspath, a:doctest)
endif
endfunction


function! s:Pdb(path, ...)
let pdb_command = "py.test " . a:1 . " " . a:path
let pdb_command = "py.test --doctest-modules " . a:1 . " " . a:path
if exists("g:ConqueTerm_Loaded")
call conque_term#open(pdb_command, ['split', 'resize 20'], 0)
else
Expand Down Expand Up @@ -1047,8 +1078,12 @@ function! s:Proxy(action, ...)
let pdb = 'False'
let looponfail = 0
let delgado = []
let doctest = 'False'

if (a:0 > 0)
if ((a:1 == 'doctest') || ((a:0 > 1) && (a:2 == 'doctest')))
let doctest = 'True'
endif
if (a:1 == 'verbose')
let verbose = 1
elseif (a:1 == '--pdb')
Expand All @@ -1065,37 +1100,37 @@ function! s:Proxy(action, ...)
if (a:action == "class")
if looponfail == 1
call s:LoopOnFail(a:action)
call s:ThisClass(verbose, pdb, delgado)
call s:ThisClass(verbose, doctest, pdb, delgado)
else
call s:ThisClass(verbose, pdb, delgado)
call s:ThisClass(verbose, doctest, pdb, delgado)
endif
elseif (a:action == "method")
if looponfail == 1
call s:LoopOnFail(a:action)
call s:ThisMethod(verbose, pdb, delgado)
call s:ThisMethod(verbose, doctest, pdb, delgado)
else
call s:ThisMethod(verbose, pdb, delgado)
call s:ThisMethod(verbose, doctest, pdb, delgado)
endif
elseif (a:action == "function")
if looponfail == 1
call s:LoopOnFail(a:action)
call s:ThisFunction(verbose, pdb, delgado)
call s:ThisFunction(verbose, doctest, pdb, delgado)
else
call s:ThisFunction(verbose, pdb, delgado)
call s:ThisFunction(verbose, doctest, pdb, delgado)
endif
elseif (a:action == "file")
if looponfail == 1
call s:LoopOnFail(a:action)
call s:ThisFile(verbose, pdb, delgado)
call s:ThisFile(verbose, doctest, pdb, delgado)
else
call s:ThisFile(verbose, pdb, delgado)
call s:ThisFile(verbose, doctest, pdb, delgado)
endif
elseif (a:action == "project" )
if looponfail ==1
call s:LoopOnFail(a:action)
call s:ThisProject(verbose, pdb, delgado)
call s:ThisProject(verbose, doctest, pdb, delgado)
else
call s:ThisProject(verbose, pdb,delgado)
call s:ThisProject(verbose, doctest, pdb,delgado)
endif
elseif (a:action == "projecttestwd")
let projecttests = s:ProjectPath()
Expand Down