Rspec-mysql 1 20 - Build Failed #21539350

Failures:

  1) Group#secret_variables_for when group has children returns all variables belong to the group and parent groups
     Failure/Error: expect(got_array.shift(2)).to contain_exactly(*expected_array1)

       expected collection contained:  [#<Ci::GroupVariable id: 12, key: "VARIABLE_12", value: nil, encrypted_value: "jkVFnyZv+WkhcQzZR9l0Ow...oup_id: 197, protected: true, created_at: "2017-07-07 15:57:12", updated_at: "2017-07-07 15:57:12">]
       actual collection contained:    [#<Ci::GroupVariable id: 15, key: "VARIABLE_15", value: nil, encrypted_value: "PbmjyR0H+vZqIJ8VwZDIVg...up_id: 199, protected: false, created_at: "2017-07-07 15:57:12", updated_at: "2017-07-07 15:57:12">]
       the missing elements were:      [#<Ci::GroupVariable id: 12, key: "VARIABLE_12", value: nil, encrypted_value: "jkVFnyZv+WkhcQzZR9l0Ow...oup_id: 197, protected: true, created_at: "2017-07-07 15:57:12", updated_at: "2017-07-07 15:57:12">]
       the extra elements were:        [#<Ci::GroupVariable id: 15, key: "VARIABLE_15", value: nil, encrypted_value: "PbmjyR0H+vZqIJ8VwZDIVg...up_id: 199, protected: false, created_at: "2017-07-07 15:57:12", updated_at: "2017-07-07 15:57:12">]
     # ./spec/models/group_spec.rb:482:in `block (4 levels) in <top (required)>'
     # ./spec/spec_helper.rb:90:in `block (2 levels) in <top (required)>'

Finished in 21 minutes 41 seconds (files took 14.82 seconds to load)
614 examples, 1 failure, 1 pending

Failed examples:

rspec ./spec/models/group_spec.rb:477 # Group#secret_variables_for when group has children returns all variables belong to the group and parent groups

https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/21539350

/cc @rspeicher

This only fails on mysql, which currently on runs on master and not on MRs for CE

cc @dosuken123

Subgroups are not supported on MySQL, so the spec probably just needs skipping for that case?

Ah, of course.

assigned to @rspeicher

changed milestone to %9.4

Nice, easy fix then

mentioned in commit 09aec212

mentioned in merge request !12722 (merged)

Sorry! I just realized!

I fixed this on https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2373. Backporting https://gitlab.com/gitlab-org/gitlab-ee/commit/5454290ea014c0ddb734d1337c462320620fb8b5 should resolve this case.

I'll create an MR for this.

/cc @ayufan

@dosuken123 Already done in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12722.

mentioned in merge request !12723 (closed)

@rspeicher Oh, sorry. I'll close mine then.

closed via merge request !12722 (merged)

mentioned in commit 5b257778

mentioned in merge request !14785