diff --git a/.github/actions/prepare-testing/action.yml b/.github/actions/prepare-testing/action.yml index b227bb44..d5d43227 100644 --- a/.github/actions/prepare-testing/action.yml +++ b/.github/actions/prepare-testing/action.yml @@ -98,10 +98,6 @@ runs: shell: bash run: | scons project/addons/gdUnit4 - echo "Applying gdUnit4 patch" - cd modules/gdUnit4 - # NOTE: Patching gdUnit4 as it errors out in Godot 4.5. - git apply ../gdunit4.patch - name: Prepare project shell: bash diff --git a/modules/gdUnit4 b/modules/gdUnit4 index 9cc47ddf..da9ab001 160000 --- a/modules/gdUnit4 +++ b/modules/gdUnit4 @@ -1 +1 @@ -Subproject commit 9cc47ddfe1d5d0f774ae5b15d183392cb54a24a2 +Subproject commit da9ab00119492b5673d13cbd959c909bde00d4b7 diff --git a/modules/gdunit4.patch b/modules/gdunit4.patch deleted file mode 100644 index 1f3b88b3..00000000 --- a/modules/gdunit4.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/addons/gdUnit4/src/doubler/CallableDoubler.gd b/addons/gdUnit4/src/doubler/CallableDoubler.gd -index 14a5947..88e598e 100644 ---- a/addons/gdUnit4/src/doubler/CallableDoubler.gd -+++ b/addons/gdUnit4/src/doubler/CallableDoubler.gd -@@ -81,16 +81,7 @@ func bindv(caller_args: Array) -> Callable: - - - @warning_ignore("untyped_declaration", "native_method_override", "unused_parameter") --func call(arg0=null, -- arg1=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg2=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg3=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg4=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg5=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg6=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg7=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg8=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE, -- arg9=GdObjects.TYPE_VARARG_PLACEHOLDER_VALUE) -> Variant: -+func call(arg0=null, ...args) -> Variant: - - # This is a placeholder function signanture without any functionallity! - # It is used by the function doubler to double function signature of Callable:call() diff --git a/project/test/isolated/test_limit_throttling.gd b/project/test/isolated/test_limit_throttling.gd index 3739a86c..e63fdfc8 100644 --- a/project/test/isolated/test_limit_throttling.gd +++ b/project/test/isolated/test_limit_throttling.gd @@ -27,13 +27,14 @@ func _before_send(_ev: SentryEvent) -> SentryEvent: ## Only two errors should be logged within the assigned time window. func test_throttling_limits() -> void: - var monitor := monitor_signals(self, false) + monitor_signals(self, false) + push_error("dummy-error") push_error("dummy-error") push_error("dummy-error") - await assert_signal(monitor).is_emitted("callback_processed") - await assert_signal(monitor).is_emitted("callback_processed") - await get_tree().create_timer(0.1).timeout + + await assert_signal(self).is_emitted("callback_processed") + await get_tree().process_frame # allow all events to process assert_int(_num_events).is_equal(2) # Wait for throttling window to expire. @@ -42,7 +43,6 @@ func test_throttling_limits() -> void: push_error("dummy-error") push_error("dummy-error") push_error("dummy-error") - await assert_signal(monitor).is_emitted("callback_processed") - await assert_signal(monitor).is_emitted("callback_processed") - await get_tree().create_timer(0.1).timeout + await assert_signal(self).is_emitted("callback_processed") + await get_tree().process_frame # allow all events to process assert_int(_num_events).is_equal(4) diff --git a/project/test/util/json_assert b/project/test/util/json_assert index 351a55d6..c8840410 160000 --- a/project/test/util/json_assert +++ b/project/test/util/json_assert @@ -1 +1 @@ -Subproject commit 351a55d6535e49db11508bd46f4bd8aa0a5e586f +Subproject commit c88404108a8bf67c00b6a24c250d70996a24908f