fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-01-06 16:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix copymerge

Browse Source 
1. Newsvals deduped
2. Oldvals in original sequence
This commit is contained in:
Sophist
2017-04-29 13:27:15 +01:00
parent f2e855771c
commit 60983a2a22
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/test_script.py
View File

@@ -274,7 +274,8 @@ class ScriptParserTest(unittest.TestCase):
def _eval_and_check_copymerge(self, context, expected):
self.parser.eval("$copymerge(target,source)", context)
self.assertEqual(sorted(self.parser.context.getall("target")), sorted(expected))
#self.assertEqual(sorted(self.parser.context.getall("target")), sorted(expected))
self.assertEqual(self.parser.context.getall("target"), expected)
def test_cmd_copymerge_notarget(self):
context = Metadata()
@@ -290,8 +291,8 @@ class ScriptParserTest(unittest.TestCase):
def test_cmd_copymerge_removedupes(self):
context = Metadata()
context["target"] = ["tag1", "tag2"]
context["source"] = ["tag2", "tag3"]
context["target"] = ["tag1", "tag2", "tag1"]
context["source"] = ["tag2", "tag3", "tag2"]
self._eval_and_check_copymerge(context, ["tag1", "tag2", "tag3"])
def test_cmd_copymerge_nonlist(self):