From 53de9090cada95cd241c6d5fc10ace9efcbd0646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Wed, 8 Jan 2025 19:00:01 +0100 Subject: [PATCH] [tests] Replace `desc.Node.internalFolder` with `{nodeCacheFolder}` --- tests/nodes/test/appendFiles.py | 2 +- tests/nodes/test/appendText.py | 2 +- tests/nodes/test/ls.py | 2 +- tests/test_compatibility.py | 22 +++++++++++----------- tests/test_invalidation.py | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/nodes/test/appendFiles.py b/tests/nodes/test/appendFiles.py index 78e7fefa..9f9c0b23 100644 --- a/tests/nodes/test/appendFiles.py +++ b/tests/nodes/test/appendFiles.py @@ -36,7 +36,7 @@ class AppendFiles(desc.CommandLineNode): name='output', label='Output', description='''''', - value=desc.Node.internalFolder + 'appendText.txt', + value='{nodeCacheFolder}/appendText.txt', ) ] diff --git a/tests/nodes/test/appendText.py b/tests/nodes/test/appendText.py index 6d49bc7c..07b72204 100644 --- a/tests/nodes/test/appendText.py +++ b/tests/nodes/test/appendText.py @@ -24,6 +24,6 @@ class AppendText(desc.CommandLineNode): name='output', label='Output', description='''''', - value=desc.Node.internalFolder + 'appendText.txt', + value='{nodeCacheFolder}/appendText.txt', ), ] diff --git a/tests/nodes/test/ls.py b/tests/nodes/test/ls.py index 6b750e2c..d3599368 100644 --- a/tests/nodes/test/ls.py +++ b/tests/nodes/test/ls.py @@ -17,6 +17,6 @@ class Ls(desc.CommandLineNode): name='output', label='Output', description='''''', - value=desc.Node.internalFolder + 'ls.txt', + value='{nodeCacheFolder}/ls.txt', ) ] diff --git a/tests/test_compatibility.py b/tests/test_compatibility.py index 63ef8345..174380bc 100644 --- a/tests/test_compatibility.py +++ b/tests/test_compatibility.py @@ -56,7 +56,7 @@ class SampleNodeV1(desc.Node): desc.StringParam(name='paramA', label='ParamA', description='', value='', invalidate=False) # No impact on UID ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -69,7 +69,7 @@ class SampleNodeV2(desc.Node): desc.StringParam(name='paramA', label='ParamA', description='', value='', invalidate=False), # No impact on UID ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -82,7 +82,7 @@ class SampleNodeV3(desc.Node): desc.File(name='in', label='Input', description='', value='',), ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -99,7 +99,7 @@ class SampleNodeV4(desc.Node): description='') ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -116,7 +116,7 @@ class SampleNodeV5(desc.Node): description='') ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -133,7 +133,7 @@ class SampleNodeV6(desc.Node): description='') ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -143,7 +143,7 @@ class SampleInputNodeV1(desc.InputNode): desc.StringParam(name='path', label='path', description='', value='', invalidate=False) # No impact on UID ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -155,7 +155,7 @@ class SampleInputNodeV2(desc.InputNode): desc.StringParam(name='in', label='path', description='', value='', invalidate=False) # No impact on UID ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ] @@ -508,7 +508,7 @@ class UidTestingNodeV1(desc.Node): inputs = [ desc.File(name="input", label="Input", description="", value="", invalidate=True), ] - outputs = [desc.File(name="output", label="Output", description="", value=desc.Node.internalFolder)] + outputs = [desc.File(name="output", label="Output", description="", value="{nodeCacheFolder}")] class UidTestingNodeV2(desc.Node): @@ -531,7 +531,7 @@ class UidTestingNodeV2(desc.Node): description="", ), ] - outputs = [desc.File(name="output", label="Output", description="", value=desc.Node.internalFolder)] + outputs = [desc.File(name="output", label="Output", description="", value="{nodeCacheFolder}")] class UidTestingNodeV3(desc.Node): @@ -554,7 +554,7 @@ class UidTestingNodeV3(desc.Node): description="", ), ] - outputs = [desc.File(name="output", label="Output", description="", value=desc.Node.internalFolder)] + outputs = [desc.File(name="output", label="Output", description="", value="{nodeCacheFolder}")] class TestUidConflict: diff --git a/tests/test_invalidation.py b/tests/test_invalidation.py index af40618e..9dfe0879 100644 --- a/tests/test_invalidation.py +++ b/tests/test_invalidation.py @@ -11,7 +11,7 @@ class SampleNode(desc.Node): desc.StringParam(name='paramA', label='ParamA', description='', value='', invalidate=False) # No impact on UID ] outputs = [ - desc.File(name='output', label='Output', description='', value=desc.Node.internalFolder) + desc.File(name='output', label='Output', description='', value="{nodeCacheFolder}") ]