try one more time on macos

Signed-off-by: Andrei Gherghescu <[email protected]>
plotly · Dec 20, 2024 · 396d6ef · 396d6ef
1 parent 285036a
commit 396d6ef
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/plotly/src/plot.rs b/plotly/src/plot.rs
@@ -761,7 +761,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
-    #[cfg(not(target_os = "macos"))]
+    // #[cfg(not(target_os = "macos"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_jpeg() {
@@ -773,7 +773,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
-    #[cfg(not(target_os = "macos"))]
+    // #[cfg(not(target_os = "macos"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_svg() {
@@ -822,7 +822,7 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // Fails in the CI
+    // #[ignore] // Fails in the CI
     #[cfg(not(target_os = "macos"))]
     #[cfg(feature = "kaleido")]
     fn test_image_to_base64() {
@@ -851,7 +851,7 @@ mod tests {
     }
 
     #[test]
-    #[ignore] // Fails in the CI
+    // #[ignore] // Fails in the CI
     #[cfg(not(target_os = "macos"))]
     #[cfg(feature = "kaleido")]
     fn test_image_to_svg_string() {

diff --git a/plotly_kaleido/src/lib.rs b/plotly_kaleido/src/lib.rs
@@ -198,7 +198,7 @@ impl Kaleido {
                 "--disable-software-rasterizer",
                 "--single-process",
                 "--disable-gpu",
-                "--timeout 2000",
+                "--no-sandbox",
             ])
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
@@ -227,16 +227,29 @@ impl Kaleido {
         let output_lines = BufReader::new(process.stdout.take().unwrap()).lines();
         for line in output_lines.map_while(Result::ok) {
             let res = KaleidoResult::from(line.as_str());
-            if let Some(image_data) = res.result {
-                // TODO: this should be refactored
-                // The assumption is that  KaleidoResult contains a single image.
-                // We should end the loop on the first valid one.
-                // If that is not the case, prior implementation would have returned the last
-                // valid image
-                return Ok(image_data);
+            match res.result {
+                Some(image_data) => {
+                    // TODO: this should be refactored
+                    // The assumption is that  KaleidoResult contains a single image.
+                    // We should end the loop on the first valid one.
+                    // If that is not the case, prior implementation would have returned the last
+                    // valid image
+                    return Ok(image_data);
+                }
+                None => {
+                    println!("empty line from Kaleido");
+                }
             }
         }
 
+	// Don't eat up Kaleido/Chromiu erros but show them in the terminal
+        let stderr = process.stderr.take().unwrap();
+        let stderr_lines = BufReader::new(stderr).lines();
+        for line in stderr_lines {
+            let line = line.unwrap();
+            eprintln!("{}", line);
+        }
+
         Ok(String::default())
     }
 }