PICARD-1063: Fix astrcmp tests if not compiled #696
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
samj1912
approved these changes
Apr 10, 2017
samj1912
requested changes
Apr 10, 2017
test/test_util_astrcmp.py
Outdated
| class AstrcmpCTest(AstrcmpBase, unittest.TestCase): | ||
| func = astrcmp_c | ||
|
|
||
| from picard.util.astrcmp import astrcmp_py |
There was a problem hiding this comment.
Why was this shifted from the top of the module?
There was a problem hiding this comment.
Because it goes with the test immediately below and compares and contrasts with the one for the C module.
test/test_util_astrcmp.py
Outdated
| class AstrcmpCTest(AstrcmpBase, unittest.TestCase): | ||
| func = astrcmp_c | ||
| except: | ||
| pass |
There was a problem hiding this comment.
Add an endline to the file. Please rebase the above changes.
Sophist-UK
force-pushed
the
PICARD-1063_Fix-astrcmp-tests-if-not-compiled
branch
from
3aedafa
to
9c93354
Compare
|
I hope that this is what you wanted. |
mineo
requested changes
Apr 10, 2017
There was a problem hiding this comment.
I think something like the following is a better approach:
diff --git a/test/test_util_astrcmp.py b/test/test_util_astrcmp.py
index 5198f5ac..fce8c779 100644
--- a/test/test_util_astrcmp.py
+++ b/test/test_util_astrcmp.py
@@ -3,7 +3,12 @@
import os
import os.path
import unittest
-from picard.util.astrcmp import astrcmp_c, astrcmp_py
+from picard.util.astrcmp import astrcmp_py
+
+try:
+ from picard.util.astrcmp import astrcmp_c
+except ImportError:
+ astrcmp_c = None
class AstrcmpBase(object):
@@ -23,6 +28,9 @@ class AstrcmpBase(object):
class AstrcmpCTest(AstrcmpBase, unittest.TestCase):
func = astrcmp_c
+ @unittest.skipIf(astrcmp_c is None, "hallo")
+ def test_astrcmp(self):
+ super()
class AstrcmpPyTest(AstrcmpBase, unittest.TestCase):
func = astrcmp_pyThis way, you'll get proper skipped indicators and the number of test executed is always constant.
|
Agreed - I will make this change. |
|
@mineo Definitely a better solution than mine - fix pushed. |
Thanks to @mineo for his help.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After #689 tests fail if astrcmp is not compiled.
Resolves https://tickets.metabrainz.org/browse/PICARD-1063