From c0b2c71382764796bdcd96888a5bbe6713e9dfe4 Mon Sep 17 00:00:00 2001 From: Juho Leinonen Date: Mon, 4 Dec 2023 14:37:01 +0200 Subject: [PATCH] Don't check Libreoffice error string - Fixes tests on macOS --- etp-backend/src/main/clj/solita/etp/service/laskutus.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etp-backend/src/main/clj/solita/etp/service/laskutus.clj b/etp-backend/src/main/clj/solita/etp/service/laskutus.clj index 9e1387648..da006ba94 100644 --- a/etp-backend/src/main/clj/solita/etp/service/laskutus.clj +++ b/etp-backend/src/main/clj/solita/etp/service/laskutus.clj @@ -297,7 +297,7 @@ (xlsx/set-sheet-landscape sheet true) (xlsx/fill-sheet! xlsx sheet tasmaytysraportti [5000 5000 7000 5000 5000]) (xlsx/save-xlsx xlsx xlsx-path))) - (let [{:keys [exit err] :as sh-result} (libreoffice/run-with-args + (let [{:keys [exit] :as sh-result} (libreoffice/run-with-args "--convert-to" "pdf" (.getName xlsx-file) @@ -305,7 +305,7 @@ (.getParent xlsx-file)) pdf-exists? (.exists pdf-file)] (io/delete-file xlsx-path) - (if (and (zero? exit) (str/blank? err) pdf-exists?) + (if (and (zero? exit) pdf-exists?) pdf-file (throw (ex-info "Creating tasmaytysraportti PDF failed." (assoc sh-result