Skip to content

🎥 Make videos programmatically with React

Fix Python payload test output parsing

JonnyBurgerb53ea23afd5c
diff --git a/packages/it-tests/src/monorepo/python-package.test.ts b/packages/it-tests/src/monorepo/python-package.test.ts
index a917985a99..a497b6e714 100644
--- a/packages/it-tests/src/monorepo/python-package.test.ts
+++ b/packages/it-tests/src/monorepo/python-package.test.ts
@@ -4,7 +4,22 @@ import {readFileSync, writeFileSync} from 'fs';
import path from 'path';
import {LambdaClientInternals} from '@remotion/lambda-client';
-const PYTHON_OUTPUT_MARKER = 10;
+const PYTHON_OUTPUT_MARKER = 'REMOTION_PAYLOAD:';
+
+const parsePythonOutput = (pythonOutput: Buffer) => {
+ const outputLine = pythonOutput
+ .toString()
+ .split('\n')
+ .find((line) => line.startsWith(PYTHON_OUTPUT_MARKER));
+
+ if (!outputLine) {
+ throw new Error(
+ `Could not find ${PYTHON_OUTPUT_MARKER} in Python output: ${pythonOutput.toString()}`,
+ );
+ }
+
+ return JSON.parse(outputLine.slice(PYTHON_OUTPUT_MARKER.length));
+};
const referenceVersion = readFileSync(
path.join(process.cwd(), '..', 'core', 'package.json'),
'utf-8',
@@ -45,8 +60,6 @@ test('Python package should create the same renderMedia payload as normal Lambda
//stdio: "inherit",
},
);
- const output = pythonOutput.toString().split('\n');
- const toParse = output[PYTHON_OUTPUT_MARKER];
const nativeVersion =
await LambdaClientInternals.makeLambdaRenderMediaPayload({
enableCancellation: false,
@@ -120,8 +133,7 @@ test('Python package should create the same renderMedia payload as normal Lambda
isProduction: null,
sampleRate: 48000,
});
- const jsonOutput = toParse.substring(0, toParse.lastIndexOf('}') + 1);
- const parsedJson = JSON.parse(jsonOutput);
+ const parsedJson = parsePythonOutput(pythonOutput);
expect({
...parsedJson,
@@ -138,8 +150,6 @@ test('Python package should create the same progress payload as normal Lambda pa
//stdio: "inherit",
},
);
- const output = pythonOutput.toString().split('\n');
- const toParse = output[PYTHON_OUTPUT_MARKER];
const nativeVersion = LambdaClientInternals.getRenderProgressPayload({
region: 'us-east-1',
functionName: 'remotion-render',
@@ -153,8 +163,7 @@ test('Python package should create the same progress payload as normal Lambda pa
region: 'us-east-1',
},
});
- const jsonOutput = toParse.substring(0, toParse.lastIndexOf('}') + 1);
- const parsedJson = JSON.parse(jsonOutput);
+ const parsedJson = parsePythonOutput(pythonOutput);
expect(parsedJson).toEqual(nativeVersion);
});
@@ -168,8 +177,6 @@ test('Python package should create the same renderStill payload as normal Lambda
//stdio: "inherit",
},
);
- const output = pythonOutput.toString().split('\n');
- const toParse = output[PYTHON_OUTPUT_MARKER];
const nativeVersion =
await LambdaClientInternals.makeLambdaRenderStillPayload({
region: 'us-east-1',
@@ -208,8 +215,7 @@ test('Python package should create the same renderStill payload as normal Lambda
mediaCacheSizeInBytes: null,
isProduction: null,
});
- const jsonOutput = toParse.substring(0, toParse.lastIndexOf('}') + 1);
- const {streamed: _, ...parsedJson} = JSON.parse(jsonOutput);
+ const {streamed: _, ...parsedJson} = parsePythonOutput(pythonOutput);
const {streamed, ...assertValue} = nativeVersion;
expect(removeUndefined(parsedJson)).toEqual(removeUndefined(assertValue));
});
diff --git a/packages/lambda-python/tests/test_get_render_progress_client.py b/packages/lambda-python/tests/test_get_render_progress_client.py
index 9c070467f2..e91e8fec36 100644
--- a/packages/lambda-python/tests/test_get_render_progress_client.py
+++ b/packages/lambda-python/tests/test_get_render_progress_client.py
@@ -10,7 +10,8 @@ class TestRemotionClient(TestCase):
)
print(
- client.construct_render_progress_request(
+ "REMOTION_PAYLOAD:"
+ + client.construct_render_progress_request(
render_id="abcdef",
bucket_name="remotion-render",
s3_output_provider=CustomCredentials(
diff --git a/packages/lambda-python/tests/test_render_client_render_media.py b/packages/lambda-python/tests/test_render_client_render_media.py
index 911eee2886..ec57e93763 100644
--- a/packages/lambda-python/tests/test_render_client_render_media.py
+++ b/packages/lambda-python/tests/test_render_client_render_media.py
@@ -83,7 +83,8 @@ class TestRemotionClient(TestCase):
self.assertIsNotNone(render_params)
self.assertIsNotNone(render_params.input_props)
print(
- client.construct_render_request(
+ "REMOTION_PAYLOAD:"
+ + client.construct_render_request(
render_params=render_params, render_type="video-or-audio"
)
)
diff --git a/packages/lambda-python/tests/test_render_client_render_still.py b/packages/lambda-python/tests/test_render_client_render_still.py
index 8d138db31a..119cfc920a 100644
--- a/packages/lambda-python/tests/test_render_client_render_still.py
+++ b/packages/lambda-python/tests/test_render_client_render_still.py
@@ -31,7 +31,8 @@ class TestRemotionClient(TestCase):
self.assertIsNotNone(render_still_params)
self.assertIsNotNone(render_still_params.input_props)
print(
- client.construct_render_request(
+ "REMOTION_PAYLOAD:"
+ + client.construct_render_request(
render_params=render_still_params, render_type='still'
)
)