Allow query counts to be less than expectation

This covers an edge case where tests in single db mode may use less
queries to cover the same data requests

ee/spec/services/vulnerability_exports/export_service_spec.rb

@@ -42,7 +42,10 @@
         export_segment
       end.count
 
-      expect(query_count).to eq(expected_export_query_count)
+      # In single DB mode some queries may be concatenated, resulting in less than the expected
+      # query count, so we permit less to cover this.
+      # See https://gitlab.com/gitlab-org/gitlab/-/issues/524755
+      expect(query_count).to be <= expected_export_query_count
     end
   end
 
@@ -270,7 +273,7 @@
           export
         end.count
 
-        expect(query_count).to eq(12)
+        expect(query_count).to be <= 12
       end
 
       it 'sets organization_id appropriately' do

spec/keeps/overdue_finalize_background_migration_spec.rb

@@ -120,11 +120,17 @@
       end
     end
 
-    context 'when schema is gitlab_ci' do
-      let(:gitlab_schema) { 'gitlab_ci' }
+    context 'when using multiple databases' do
+      before do
+        skip_if_shared_database(:ci)
+      end
 
-      it 'returns the database name' do
-        expect(database_name).to eq(database_exists?(:ci) ? 'ci' : 'main')
+      context 'when schema is gitlab_ci' do
+        let(:gitlab_schema) { 'gitlab_ci' }
+
+        it 'returns the database name' do
+          expect(database_name).to eq('ci')
+        end
       end
     end
   end