From e91a52604c7344c25c120546f988981dff034f9f Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Thu, 29 Oct 2015 15:05:22 +0100 Subject: [PATCH 1/3] Travis should skip only the full compilation --- test/test_compilation/test_compilation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_compilation/test_compilation.py b/test/test_compilation/test_compilation.py index a3a402d4..15f62ec5 100644 --- a/test/test_compilation/test_compilation.py +++ b/test/test_compilation/test_compilation.py @@ -48,8 +48,6 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): def _create_test(cls, base): """Return a function testing that `base` compiles.""" - @unittest.skipIf('TRAVIS' in os.environ, - "Travis does not support lualatex compilation yet") def test_compile(self): """Test that `base` is correctly compiled.""" if base is None: @@ -86,7 +84,9 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): ) # Check compilation - self.assertEqual(0, self.compile_songbook(songbook)) + if not 'TRAVIS' in os.environ: + # Travis does not support lualatex compilation yet + self.assertEqual(0, self.compile_songbook(songbook)) test_compile.__doc__ = ( "Test that '{base}' is correctly compiled." From e7babf5afb1678ecbea815df3677fd7b2adfb6d9 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Thu, 29 Oct 2015 15:08:19 +0100 Subject: [PATCH 2/3] Correct travis check --- test/test_compilation/test_compilation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_compilation/test_compilation.py b/test/test_compilation/test_compilation.py index 15f62ec5..11bb197b 100644 --- a/test/test_compilation/test_compilation.py +++ b/test/test_compilation/test_compilation.py @@ -84,7 +84,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): ) # Check compilation - if not 'TRAVIS' in os.environ: + if 'TRAVIS' not in os.environ: # Travis does not support lualatex compilation yet self.assertEqual(0, self.compile_songbook(songbook)) From 7d3864b72a5fd5d34eb6344b0573a3ed278a2440 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Thu, 29 Oct 2015 15:16:23 +0100 Subject: [PATCH 3/3] Correct test --- test/test_compilation/datadir.tex.control | 1 - 1 file changed, 1 deletion(-) diff --git a/test/test_compilation/datadir.tex.control b/test/test_compilation/datadir.tex.control index 4f6c8521..90c8d34b 100644 --- a/test/test_compilation/datadir.tex.control +++ b/test/test_compilation/datadir.tex.control @@ -32,7 +32,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english}