autour_de_minuit/blender-asset-tracer
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Path rewriting for sequences seems to be working too.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2018-03-06 16:41:16 +01:00
parent 71dd5bc11b
commit e2123f8090
6 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_tracer.py
+14 -13
View File
@@ -80,15 +80,15 @@ class DepsTest(AbstractTracerTest):
actual = Expect(actual_type, actual_full_field, actual_dirname, actual_basename,
dep.asset_path, dep.is_sequence)
exp = expects[dep.block_name]
if isinstance(exp, set):
exp = expects.get(dep.block_name, None)
if isinstance(exp, (set, list)):
self.assertIn(actual, exp, msg='for block %s' % dep.block_name)
exp.discard(actual)
exp.remove(actual)
if not exp:
# Don't leave empty sets in expects.
del expects[dep.block_name]
else:
self.assertEqual(exp, actual, msg='for block %s' % dep.block_name)
self.assertEqual(actual, exp, msg='for block %s' % dep.block_name)
del expects[dep.block_name]
# All expected uses should have been seen.
@@ -118,16 +118,17 @@ class DepsTest(AbstractTracerTest):
def test_seq_image_sequence(self):
expects = {
b'SQ000210.png': Expect(
'Sequence', None, 'dir[768]', 'name[256]', b'//imgseq/000210.png', True),
b'SQvideo-tiny.mkv': Expect(
'Sequence', None, 'dir[768]', 'name[256]',
b'//../../../../cloud/pillar/testfiles/video-tiny.mkv', False),
b'-unnamed-': [
Expect('Strip', None, 'dir[768]', 'name[256]', b'//imgseq/000210.png', True),
# The sound will be referenced twice, from the sequence strip and an SO data block.
b'SQvideo-tiny.001': Expect(
'Sequence', None, 'dir[768]', 'name[256]',
b'//../../../../cloud/pillar/testfiles/video-tiny.mkv', False),
# Video strip reference.
Expect('Strip', None, 'dir[768]', 'name[256]',
b'//../../../../cloud/pillar/testfiles/video-tiny.mkv', False),
# The sound will be referenced twice, from the sequence strip and an SO data block.
Expect('Strip', None, 'dir[768]', 'name[256]',
b'//../../../../cloud/pillar/testfiles/video-tiny.mkv', False),
],
b'SOvideo-tiny.mkv': Expect(
'bSound', 'name[1024]', None, None,
b'//../../../../cloud/pillar/testfiles/video-tiny.mkv', False),
tests/test_tracer_file_sequence.py
-6
View File
@@ -14,12 +14,6 @@ class ExpandFileSequenceTest(AbstractBlendFileTest):
actual = list(file_sequence.expand_sequence(path))
self.assertEqual(self.imgseq, actual)
def test_directory(self):
path = self.blendfiles / 'imgseq'
actual = list(file_sequence.expand_sequence(path))
expected = self.imgseq + [self.blendfiles / 'imgseq/LICENSE.txt']
self.assertEqual(expected, actual)
def test_first_file(self):
path = self.blendfiles / 'imgseq/000210.png'
actual = list(file_sequence.expand_sequence(path))