unrestraint

tests/test_help.py

@@ -7,7 +7,11 @@ from argparse import RawDescriptionHelpFormatter
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 
@@ -31,7 +35,7 @@ def get_config(json):
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 

tests/test_leadership.py

@@ -6,7 +6,11 @@ import pytest
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Leadership, Config, submulti
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 def get_config(json, with_mandatory=False):
@@ -31,7 +35,7 @@ def get_config(json, with_mandatory=False):
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-api'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 

tests/test_optiondescription.py

@@ -6,7 +6,11 @@ import pytest
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False, empty_optiondescription=False):
@@ -59,7 +63,7 @@ def get_config(json, has_tree=False, default_verbosity=False, add_long=False, ad
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 

tests/test_readme.py

@@ -6,7 +6,11 @@ import pytest
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False):
@@ -67,7 +71,7 @@ def get_config(json, has_tree=False, default_verbosity=False, add_long=False, ad
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 
@@ -461,7 +465,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -477,7 +481,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -493,7 +497,7 @@ prog.py: error: unrecognized arguments: --root.int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--root.int'])
+            parser.parse_args(['none', '--root.int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -509,7 +513,7 @@ prog.py: error: unrecognized arguments: --root.int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--root.int'])
+            parser.parse_args(['none', '--root.int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -525,7 +529,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -541,7 +545,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:

tests/test_shortarg.py

@@ -6,10 +6,14 @@ from contextlib import redirect_stderr
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param