diff --git a/test/test_script.py b/test/test_script.py index e22575cb1..352dc2963 100644 --- a/test/test_script.py +++ b/test/test_script.py @@ -257,7 +257,7 @@ class ScriptParserTest(unittest.TestCase): def _eval_and_check_copymerge(self, context, expected): self.parser.eval("$copymerge(target,source)", context) - self.assertEqual(self.parser.context.getall("target"), expected) + self.assertEqual(sorted(self.parser.context.getall("target")), sorted(expected)) def test_cmd_copymerge_notarget(self): context = Metadata() diff --git a/test/test_utils.py b/test/test_utils.py index 9c2a86a49..fe5e64068 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -5,10 +5,10 @@ import sys import unittest from picard import util -import __builtin__ +import builtins # ensure _() is defined -if '_' not in __builtin__.__dict__: - __builtin__.__dict__['_'] = lambda a: a +if '_' not in builtins.__dict__: + builtins.__dict__['_'] = lambda a: a class ReplaceWin32IncompatTest(unittest.TestCase):