##// END OF EJS Templates
Fixed spacing in pandoc tests
Jonathan Frederic -
Show More
@@ -1,74 +1,63 b''
1 1 """Test Pandoc module"""
2 2
3 3 #-----------------------------------------------------------------------------
4 # Copyright (C) 2013 The IPython Development Team
4 # Copyright (C) 2014 The IPython Development Team
5 5 #
6 6 # Distributed under the terms of the BSD License. The full license is in
7 7 # the file COPYING, distributed as part of this software.
8 8 #-----------------------------------------------------------------------------
9 9
10 10 #-----------------------------------------------------------------------------
11 11 # Imports
12 12 #-----------------------------------------------------------------------------
13
14 13 import os
15 14
16 from .base import TestsBase
17 from ..utils import pandoc
18
19 15 from IPython.testing import decorators as dec
20 16
21 #-----------------------------------------------------------------------------
22 # Constants
23 #-----------------------------------------------------------------------------
24
17 from .base import TestsBase
18 from ..utils import pandoc
25 19
26 20 #-----------------------------------------------------------------------------
27 21 # Classes and functions
28 22 #-----------------------------------------------------------------------------
29
30
31 23 class TestPandoc(TestsBase):
32 24 """Collection of Pandoc tests"""
33 25
34 26 def __init__(self, *args, **kwargs):
35 27 super(TestPandoc, self).__init__(*args, **kwargs)
36 28 self.original_env = os.environ.copy()
37 29
38 30 @dec.onlyif_cmds_exist('pandoc')
39 31 def test_pandoc_available(self):
40 32 """ Test behaviour that pandoc functions raise PandocMissing as documented """
41 33 pandoc.clean_cache()
42 34
43 35 os.environ["PATH"] = ""
44 36 assert pandoc_function_raised_missing(pandoc.get_pandoc_version) == True
45 37 assert pandoc_function_raised_missing(pandoc.check_pandoc_version) == True
46 38 assert pandoc_function_raised_missing(pandoc.pandoc, "", "markdown", "html") == True
47 39
48 40 # original_env["PATH"] should contain pandoc
49 41 os.environ["PATH"] = self.original_env["PATH"]
50 42 assert pandoc_function_raised_missing(pandoc.get_pandoc_version) == False
51 43 assert pandoc_function_raised_missing(pandoc.check_pandoc_version) == False
52 44 assert pandoc_function_raised_missing(pandoc.pandoc, "", "markdown", "html") == False
53
54 45
55 @dec.onlyif_cmds_exist('pandoc')
46 @dec.onlyif_cmds_exist('pandoc')
56 47 def test_minimal_version(self):
57 48 original_minversion = pandoc._minimal_version
58 49
59 50 pandoc._minimal_version = "120.0"
60 51 assert not pandoc.check_pandoc_version()
61 52
62 53 pandoc._minimal_version = pandoc.get_pandoc_version()
63 54 assert pandoc.check_pandoc_version()
64
65 55
66
67 56
68 57 def pandoc_function_raised_missing(f, *args, **kwargs):
69 58 try:
70 59 f(*args, **kwargs)
71 60 except pandoc.PandocMissing:
72 61 return True
73 62 else:
74 63 return False
General Comments 0
You need to be logged in to leave comments. Login now