Skip to content

Commit

Permalink
3Delight RendererTest : Fix failure to parse NSI file
Browse files Browse the repository at this point in the history
The tests affected by this were merged to `1.3_maintenance` where `.nsi` files is written as ASCII. But on main since f417065 we need to use the `.nsia` extension for ASCII, and `.nsi` is binary. This was giving us the following CI failure :

```
Error: ERROR: testUSDLightShaping (IECoreDelightTest.RendererTest.RendererTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/__w/gaffer/gaffer/build/python/IECoreDelightTest/RendererTest.py", line 1316, in testUSDLightShaping
    nsi = self.__parseDict( self.__renderLights( lightSettings ) )
  File "/__w/gaffer/gaffer/build/python/IECoreDelightTest/RendererTest.py", line 1408, in __parseDict
    for i in f.readlines() :
  File "/__w/gaffer/gaffer/build/lib/python3.7/codecs.py", line 322, in decode
    (result, consumed) = self._buffer_decode(data, self.errors, final)
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xcc in position 97: invalid continuation byte
```
  • Loading branch information
johnhaddon committed Jan 30, 2024
1 parent 2a061b8 commit 89bc358
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/IECoreDelightTest/RendererTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ def __renderLights( self, lightSettings ) :
r = GafferScene.Private.IECoreScenePreview.Renderer.create(
"3Delight",
GafferScene.Private.IECoreScenePreview.Renderer.RenderType.SceneDescription,
str( self.temporaryDirectory() / "test.nsi" ),
str( self.temporaryDirectory() / "test.nsia" ),
)

for lightType, position, rotation, geometryType, geometryAttributes, shader, lightParameters, dlParameters in lightSettings :
Expand All @@ -1147,7 +1147,7 @@ def __renderLights( self, lightSettings ) :
r.render()
del r

return self.temporaryDirectory() / "test.nsi"
return self.temporaryDirectory() / "test.nsia"

def __assertLightSettings( self, nsi, lightSettings ) :

Expand Down

0 comments on commit 89bc358

Please sign in to comment.