summaryrefslogtreecommitdiffstats
path: root/tests/test_integration.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_integration.py')
-rw-r--r--tests/test_integration.py16
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 4bfd1d2..352aab6 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -307,18 +307,11 @@ class TestCheck(DemoBuildTest):
def test_check_links(self):
with cd(self.target_dir):
- try:
- __main__.main(['check', '-l'])
- except SystemExit as e:
- self.assertEqual(e.code, 0)
+ self.assertIsNone(__main__.main(['check', '-l']))
def test_check_files(self):
with cd(self.target_dir):
- try:
- __main__.main(['check', '-f'])
- except SystemExit as e:
- self.assertEqual(e.code, 0)
-
+ self.assertIsNone(__main__.main(['check', '-f']))
class TestCheckAbsoluteSubFolder(TestCheck):
"""Validate links in a site which is:
@@ -532,12 +525,11 @@ class InvariantBuildTest(EmptyBuildTest):
src1 = os.path.join(os.path.dirname(__file__), 'data', '1-nolinks.rst')
dst1 = os.path.join(self.target_dir, 'posts', '1.rst')
shutil.copy(src1, dst1)
- os.system('rm "{0}/stories/creating-a-theme.rst" "{0}/stories/extending.txt" "{0}/stories/internals.txt" "{0}/stories/manual.rst" "{0}/stories/social_buttons.txt" "{0}/stories/theming.rst" "{0}/stories/upgrading-to-v6.txt"'.format(self.target_dir))
-
+ os.system('rm "{0}/stories/creating-a-theme.rst" "{0}/stories/extending.txt" "{0}/stories/internals.txt" "{0}/stories/manual.rst" "{0}/stories/social_buttons.txt" "{0}/stories/theming.rst" "{0}/stories/path_handlers.txt" "{0}/stories/charts.txt"'.format(self.target_dir))
def test_invariance(self):
"""Compare the output to the canonical output."""
if sys.version_info[0:2] != (2, 7):
- pytest.skip('only python 2.7 is supported right now')
+ pytest.skip('only python 2.7 is supported for invariance')
good_path = os.path.join(os.path.dirname(__file__), 'data', 'baseline{0[0]}.{0[1]}'.format(sys.version_info))
if not os.path.exists(good_path):
pytest.skip('no baseline found')