Fix: Separate normal renderer output from diagnostics

tests/test_camera_cli.py

@@ -150,7 +150,7 @@ with tempfile.TemporaryDirectory(prefix='gr-camera-cli-', dir='/tmp/opencode') a
             fast_path = tmp / f'minkowski_fast.{ext}'
             fast = run(binary, *common, '--fast-mode', '--fast-supersample', 2,
                        '--output', fast_path)
-            assert 'Fast FFTW:' in fast.stderr, fast.stderr
+            assert 'Fast FFTW:' in fast.stdout, fast.stdout
             assert image_payload(fast_path)
 
         # Equivalent independently specified and inferred camera geometry.
@@ -227,8 +227,8 @@ with tempfile.TemporaryDirectory(prefix='gr-camera-cli-', dir='/tmp/opencode') a
                        tmp / 'missing_catalog.csv', '--output', long_path,
                        ok=False)
         assert 'Mesh overlay output path is too long' in too_long.stderr, too_long.stderr
-        assert 'Blackbody backend' not in too_long.stderr, too_long.stderr
-        assert 'PSF cache ready' not in too_long.stderr
+        assert 'Blackbody backend' not in (too_long.stdout + too_long.stderr), too_long.stderr
+        assert 'PSF cache ready' not in (too_long.stdout + too_long.stderr)
 
         errors = [
             (['--observer-time'], None),
@@ -294,7 +294,7 @@ with tempfile.TemporaryDirectory(prefix='gr-camera-cli-', dir='/tmp/opencode') a
             if message:
                 assert message in result.stderr, result.stderr
             assert not missing_catalog.exists(), result.stderr
-            assert 'PSF cache ready' not in result.stderr
+            assert 'PSF cache ready' not in (result.stdout + result.stderr)
 
         track = tmp / f'{backend}.csv'
         run(TESTDIR / f'test_observer_{backend}', track)
@@ -397,8 +397,8 @@ with tempfile.TemporaryDirectory(prefix='gr-camera-cli-', dir='/tmp/opencode') a
                         '--sensor-bloom-transfer', 0.5,
                         '--output', bloom_output)
         assert image_payload(bloom_output) != baseline
-        assert 'Sensor bloom:' in bloom_run.stderr, bloom_run.stderr
-        report = bloom_run.stderr.split('Sensor bloom:', 1)[1].splitlines()[0]
+        assert 'Sensor bloom:' in bloom_run.stdout, bloom_run.stdout
+        report = bloom_run.stdout.split('Sensor bloom:', 1)[1].splitlines()[0]
         fields = dict(token.split('=', 1) for token in report.split() if '=' in token)
         assert int(fields['saturated']) > 0, report
         assert int(fields['iterations'].split('/')[0]) >= 1, report
@@ -443,8 +443,8 @@ with tempfile.TemporaryDirectory(prefix='gr-camera-cli-', dir='/tmp/opencode') a
                          '--movie-track-samples', '--frames-dir', tmp,
                          '--frames-prefix', 'mixed', '--verbose',
                          '--lens-map-output', parallel_map)
-            assert 'Ray trace generation 1: frame 0 added' in result.stderr
-            assert 'Ray trace generation 0: frame 1 added' not in result.stderr
+            assert 'Ray trace generation 1: frame 0 added' in result.stdout
+            assert 'Ray trace generation 0: frame 1 added' not in result.stdout
             for frame in range(2):
                 image_payload(tmp / f'mixed_{frame:06d}.{ext}',
                               dimensions=(64, 36), allow_black=True)