Skip to content

Skip upstream's new test

张泽华请求将fix-test-failures-220629合并到main-jh

What does this MR do and why?

Upstream added new test few hours ago. https://gitlab.com/gitlab-org/gitlab/-/commit/c561a8af000a97fd12f63c4936707c864ce22114#b3931eb029c5e4a39df49db78fc519bf6a17c133

This test failed in JH side. https://jihulab.com/gitlab-cn/gitlab/-/jobs/3192000

The reason is in this file https://jihulab.com/gitlab-cn/gitlab/-/blob/main-jh/ee/app/components/namespaces/free_user_cap/personal_usage_quota_limitations_alert_component.rb#L66 the code called free_user_cap_enforced? method.

And this method called https://jihulab.com/gitlab-cn/gitlab/-/blob/main-jh/ee/app/components/namespaces/free_user_cap/personal_usage_quota_limitations_alert_component.rb#L71, and we override enforce_cap? method in JH side. https://jihulab.com/gitlab-cn/gitlab/-/blob/main-jh/jh/app/models/jh/namespaces/free_user_cap/standard.rb#L15, which case the failure of this test case.

Screenshots or screen recordings

These are strongly recommended to assist reviewers and reduce the time to merge your change.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

合并请求报告

加载中