Fix running tests on mac (#7768)

defold · Jun 29, 2023 · a1e7d61 · a1e7d61
1 parent a64bce5
commit a1e7d61
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/editor/project.clj b/editor/project.clj
@@ -184,12 +184,7 @@
 
   :uberjar-exclusions [#"^natives/"]
 
-  :profiles          {:test    {:injections [(defonce initialize-test-prerequisites
-                                               (do
-                                                 (com.defold.libs.ResourceUnpacker/unpackResources)
-                                                 (javafx.application.Platform/startup
-                                                   (fn []
-                                                     (com.jogamp.opengl.GLProfile/initSingleton)))))]
+  :profiles          {:test    {:injections [(com.defold.libs.ResourceUnpacker/unpackResources)]
                                 :resource-paths ["test/resources"]
                                 :jvm-opts ["-Ddefold.tests=true"]}
                       :preflight {:dependencies [[jonase/kibit "0.1.6" :exclusions [org.clojure/clojure]]

diff --git a/editor/test/integration/animation_set_test.clj b/editor/test/integration/animation_set_test.clj
@@ -51,7 +51,6 @@
                                                                           (map remove-empty-channels)
                                                                           (apply merge-with (constantly ::conflicting-data)))])))]
           (testing "Bone exists in skeleton"
-            (prn "MAWE BONE ID" bone-id)
             (is (some #(= bone-id %) bone-list)))
 
           (testing "Channels are not animated by multiple tracks"

diff --git a/editor/test/integration/lsp_test.clj b/editor/test/integration/lsp_test.clj
@@ -472,7 +472,7 @@
                      (make-test-server-launcher
                        {"initialize" (constantly {:capabilities {:diagnosticProvider {:workspaceDiagnostics true}}})
                         "initialized" (constantly nil)
-                        "workspace/diagnostic" (fn [_ _] (throw (ex-info "Fail!" {})))
+                        "workspace/diagnostic" (fn [_ _] (throw (ex-info "This exception should be correctly handled by lsp test" {})))
                         "shutdown" (constantly nil)
                         "exit" (constantly nil)})}})
               _ (Thread/sleep 100)