build with 3.3 when a change is abandoned, we get two 'ref-updated' event on the change's meta ref, and when a change is merged, we get four 'ref-updated' event on the change's meta ref. So, update the corresponding tests accordingly. Change-Id: I4a2b65b2342451722dda78e109f8f192020c1ce7
diff --git a/WORKSPACE b/WORKSPACE index a1ce3b2..f8df036 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "f96f4bce9ffafeaa200fc009a378921c512fcb0a", + commit = "10e78cc706760ff24cbc67ba527f9a8e4134d66f", ) load(
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile index 63ddb00..b7c581e 100755 --- a/test/docker/gerrit/Dockerfile +++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.2.10-ubuntu20 +FROM gerritcodereview/gerrit:3.3.4-ubuntu20 USER root
diff --git a/test/test_events_plugin.sh b/test/test_events_plugin.sh index e76532a..f44d51e 100755 --- a/test/test_events_plugin.sh +++ b/test/test_events_plugin.sh
@@ -244,7 +244,7 @@ result_type "$GROUP $type" "ref-updated" 2 type=change-abandoned -capture_events 2 +capture_events 3 review "$ch1,1" --abandon result_type "$GROUP" "$type" @@ -271,7 +271,7 @@ result_type "$GROUP" "$type" 2 type=change-merged -events_count=3 +events_count=4 # If reviewnotes plugin is installed, an extra event of type 'ref-updated' # on 'refs/notes/review' is fired when a change is merged. is_plugin_installed reviewnotes && events_count="$((events_count+1))"