Fix expectation with VM lock events

VM lock introduced new events for VM operations

Author: mariash

src/spec/integration/cli_events_spec.rb

@@ -35,7 +35,21 @@ def first_part_of_test
     expect(stable_data).to all(include('task_id' => /[0-9]{1,3}|-|^$/))
     expect(stable_data).to all(include('id' => /[0-9]{1,3} <- [0-9]{1,3}|[0-9]{1,3}|^$/))
 
-    expect(flexible_data).to contain_exactly(
+    vm_lock_events = flexible_data.select { |e| e['object_type'] == 'lock' && e['object_name'].match?(/\Alock:vm:/) }
+    non_vm_lock_data = flexible_data.reject { |e| e['object_type'] == 'lock' && e['object_name'].match?(/\Alock:vm:/) }
+
+    expect(vm_lock_events).to all(include(
+      'object_type' => 'lock',
+      'object_name' => /\Alock:vm:[0-9]{1,6}\z/,
+      'action' => /acquire|release/,
+      'context' => '',
+      'deployment' => '',
+      'instance' => '',
+      'error' => '',
+    ))
+    expect(vm_lock_events.count { |e| e['action'] == 'acquire' }).to eq(vm_lock_events.count { |e| e['action'] == 'release' })
+
+    expect(non_vm_lock_data).to contain_exactly(
       {'action' => 'start', 'object_type' => 'worker', 'object_name' => 'worker_0', 'deployment' => '', 'instance' => '', 'context' => '', 'error' => ''},
       {'action' => 'start', 'object_type' => 'worker', 'object_name' => 'worker_1', 'deployment' => '', 'instance' => '', 'context' => '', 'error' => ''},
       {'action' => 'start', 'object_type' => 'worker', 'object_name' => 'worker_2', 'deployment' => '', 'instance' => '', 'context' => '', 'error' => ''},

src/spec/integration/events_access_spec.rb

@@ -34,21 +34,21 @@ def run_events_cmd(env)
     output, exit_code = run_events_cmd(team_client_read_env)
 
     expect(exit_code).to eq(0)
-    expect(output).to include '39 events'
+    expect(output).to include '43 events'
   end
 
   it 'bosh.teams.X.admin should be able to see all events in the director' do
     output, exit_code = run_events_cmd(team_client_admin_env)
 
     expect(exit_code).to eq(0)
-    expect(output).to include '39 events'
+    expect(output).to include '43 events'
   end
 
   it 'bosh.X.admin should be able to see all events in the director' do
     output, exit_code = run_events_cmd(director_client_env)
 
     expect(exit_code).to eq(0)
-    expect(output).to include '39 events'
+    expect(output).to include '43 events'
   end
 
   it 'no-access should not be able to see all events in the director' do