hybrid_platforms_conductor 33.0.0 → 33.0.1

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/reserve_proxmox_container/pve_node_resources_spec.rb

@@ -2,9 +2,9 @@ require 'hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox'
 
 describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
-  context 'checking the reserve_proxmox_container sync tool' do
+  context 'when checking the reserve_proxmox_container sync tool' do
 
-    context 'checking resources limits at the PVE node level' do
+    context 'when checking resources limits at the PVE node level' do
 
       it 'reserves a resource on an empty PVE node having enough resources' do
         with_sync_node do
@@ -86,12 +86,14 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'chooses among several PVE nodes the one having enough resources' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_1' => { loadavg: [0.1, 11, 0.1] },
-            'pve_node_2' => { memory_total: 1126 * 1024 * 1024 },
-            'pve_node_3' => {},
-            'pve_node_4' => { storage_total: 512 * 1024 * 1024 }
-          })
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_1' => { loadavg: [0.1, 11, 0.1] },
+              'pve_node_2' => { memory_total: 1126 * 1024 * 1024 },
+              'pve_node_3' => {},
+              'pve_node_4' => { storage_total: 512 * 1024 * 1024 }
+            }
+          )
           expect(call_reserve_proxmox_container(2, 1024, 4, config: { pve_nodes: %w[pve_node_1 pve_node_2 pve_node_3 pve_node_4] })).to eq(
             pve_node: 'pve_node_3',
             vm_id: 1000,
@@ -102,12 +104,14 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'chooses among several PVE nodes by discovering them instead of limiting them in the config' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_1' => { loadavg: [0.1, 11, 0.1] },
-            'pve_node_2' => { memory_total: 1126 * 1024 * 1024 },
-            'pve_node_3' => {},
-            'pve_node_4' => { storage_total: 512 * 1024 * 1024 }
-          })
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_1' => { loadavg: [0.1, 11, 0.1] },
+              'pve_node_2' => { memory_total: 1126 * 1024 * 1024 },
+              'pve_node_3' => {},
+              'pve_node_4' => { storage_total: 512 * 1024 * 1024 }
+            }
+          )
           expect(call_reserve_proxmox_container(2, 1024, 4, config: { pve_nodes: nil })).to eq(
             pve_node: 'pve_node_3',
             vm_id: 1000,
@@ -118,13 +122,15 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'chooses among several PVE nodes the one having the most free resources' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_1gb' => { memory_total: 1 * 1024 * 1024 * 1024 },
-            'pve_node_4.5gb' => { memory_total: 4608 * 1024 * 1024 },
-            'pve_node_5gb' => { memory_total: 5 * 1024 * 1024 * 1024 },
-            'pve_node_10gb' => { memory_total: 10 * 1024 * 1024 * 1024 },
-            'pve_node_7gb' => { memory_total: 7 * 1024 * 1024 * 1024 }
-          })
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_1gb' => { memory_total: 1 * 1024 * 1024 * 1024 },
+              'pve_node_4.5gb' => { memory_total: 4608 * 1024 * 1024 },
+              'pve_node_5gb' => { memory_total: 5 * 1024 * 1024 * 1024 },
+              'pve_node_10gb' => { memory_total: 10 * 1024 * 1024 * 1024 },
+              'pve_node_7gb' => { memory_total: 7 * 1024 * 1024 * 1024 }
+            }
+          )
           expect(call_reserve_proxmox_container(2, 4096, 4, config: { pve_nodes: %w[pve_node_1gb pve_node_4.5gb pve_node_5gb pve_node_10gb pve_node_7gb] })).to eq(
             pve_node: 'pve_node_10gb',
             vm_id: 1000,
@@ -135,13 +141,15 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'chooses among several PVE nodes the one having the most free resources and that are part of the authorized PVE nodes' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_1gb' => { memory_total: 1 * 1024 * 1024 * 1024 },
-            'pve_node_4.5gb' => { memory_total: 4608 * 1024 * 1024 },
-            'pve_node_5gb' => { memory_total: 5 * 1024 * 1024 * 1024 },
-            'pve_node_10gb' => { memory_total: 10 * 1024 * 1024 * 1024 },
-            'pve_node_7gb' => { memory_total: 7 * 1024 * 1024 * 1024 }
-          })
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_1gb' => { memory_total: 1 * 1024 * 1024 * 1024 },
+              'pve_node_4.5gb' => { memory_total: 4608 * 1024 * 1024 },
+              'pve_node_5gb' => { memory_total: 5 * 1024 * 1024 * 1024 },
+              'pve_node_10gb' => { memory_total: 10 * 1024 * 1024 * 1024 },
+              'pve_node_7gb' => { memory_total: 7 * 1024 * 1024 * 1024 }
+            }
+          )
           expect(call_reserve_proxmox_container(2, 4096, 4, config: { pve_nodes: %w[pve_node_1gb pve_node_5gb pve_node_7gb] })).to eq(
             pve_node: 'pve_node_7gb',
             vm_id: 1000,
@@ -152,13 +160,15 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'does not reserve a resource if the only PVE nodes having resources are not in the list of authorized PVE nodes' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_1gb' => { memory_total: 1 * 1024 * 1024 * 1024 },
-            'pve_node_4.5gb' => { memory_total: 4608 * 1024 * 1024 },
-            'pve_node_5gb' => { memory_total: 5 * 1024 * 1024 * 1024 },
-            'pve_node_10gb' => { memory_total: 10 * 1024 * 1024 * 1024 },
-            'pve_node_7gb' => { memory_total: 7 * 1024 * 1024 * 1024 }
-          })
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_1gb' => { memory_total: 1 * 1024 * 1024 * 1024 },
+              'pve_node_4.5gb' => { memory_total: 4608 * 1024 * 1024 },
+              'pve_node_5gb' => { memory_total: 5 * 1024 * 1024 * 1024 },
+              'pve_node_10gb' => { memory_total: 10 * 1024 * 1024 * 1024 },
+              'pve_node_7gb' => { memory_total: 7 * 1024 * 1024 * 1024 }
+            }
+          )
           expect(call_reserve_proxmox_container(2, 4096, 4, config: { pve_nodes: %w[pve_node_1gb pve_node_4.5gb] })).to eq(error: 'not_enough_resources')
         end
       end
@@ -167,25 +177,32 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
         with_sync_node do
           # We ask to reserve 1GB of RAM and 1GB of disk.
           # Commented are the % of those resources' usage when having such a container in each PVE node, with the resulting score considering RAM 3 times as important than disk.
-          mock_proxmox(mocked_pve_nodes: {
-            # 100% RAM 25% disk => 325
-            'pve_node_1gb_4gb' => { memory_total: 1 * 1024 * 1024 * 1024, storage_total: 4 * 1024 * 1024 * 1024 },
-            # 50% RAM 25% disk => 175
-            'pve_node_2gb_4gb' => { memory_total: 2 * 1024 * 1024 * 1024, storage_total: 4 * 1024 * 1024 * 1024 },
-            # 50% RAM 50% disk => 200
-            'pve_node_2gb_2gb' => { memory_total: 2 * 1024 * 1024 * 1024, storage_total: 2 * 1024 * 1024 * 1024 },
-            # 40% RAM 10% disk => 130
-            'pve_node_2.5gb_10gb' => { memory_total: 2560 * 1024 * 1024, storage_total: 10 * 1024 * 1024 * 1024 },
-            # 25% RAM 50% disk => 125
-            'pve_node_4gb_2gb' => { memory_total: 4 * 1024 * 1024 * 1024, storage_total: 2 * 1024 * 1024 * 1024 },
-            # 25% RAM 100% disk => 175
-            'pve_node_4gb_1gb' => { memory_total: 4 * 1024 * 1024 * 1024, storage_total: 1 * 1024 * 1024 * 1024 }
-          })
-          expect(call_reserve_proxmox_container(2, 1024, 1, config: {
-            coeff_ram_consumption: 3,
-            coeff_disk_consumption: 1,
-            pve_nodes: nil
-          })).to eq(
+          mock_proxmox(
+            mocked_pve_nodes: {
+              # 100% RAM 25% disk => 325
+              'pve_node_1gb_4gb' => { memory_total: 1 * 1024 * 1024 * 1024, storage_total: 4 * 1024 * 1024 * 1024 },
+              # 50% RAM 25% disk => 175
+              'pve_node_2gb_4gb' => { memory_total: 2 * 1024 * 1024 * 1024, storage_total: 4 * 1024 * 1024 * 1024 },
+              # 50% RAM 50% disk => 200
+              'pve_node_2gb_2gb' => { memory_total: 2 * 1024 * 1024 * 1024, storage_total: 2 * 1024 * 1024 * 1024 },
+              # 40% RAM 10% disk => 130
+              'pve_node_2.5gb_10gb' => { memory_total: 2560 * 1024 * 1024, storage_total: 10 * 1024 * 1024 * 1024 },
+              # 25% RAM 50% disk => 125
+              'pve_node_4gb_2gb' => { memory_total: 4 * 1024 * 1024 * 1024, storage_total: 2 * 1024 * 1024 * 1024 },
+              # 25% RAM 100% disk => 175
+              'pve_node_4gb_1gb' => { memory_total: 4 * 1024 * 1024 * 1024, storage_total: 1 * 1024 * 1024 * 1024 }
+            }
+          )
+          expect(
+            call_reserve_proxmox_container(
+              2, 1024, 1,
+              config: {
+                coeff_ram_consumption: 3,
+                coeff_disk_consumption: 1,
+                pve_nodes: nil
+              }
+            )
+          ).to eq(
             pve_node: 'pve_node_4gb_2gb',
             vm_id: 1000,
             vm_ip: '192.168.0.100'

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/reserve_proxmox_container/retries_spec.rb

@@ -2,9 +2,9 @@ require 'hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox'
 
 describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
-  context 'checking the reserve_proxmox_container sync tool' do
+  context 'when checking the reserve_proxmox_container sync tool' do
 
-    context 'checking retries mechanism' do
+    context 'when checking retries mechanism' do
 
       it 'retries a few times before ending in error' do
         with_sync_node do
@@ -16,11 +16,13 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'retries errors a few times until it gets resolved' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: [
-            { 'pve_node_name' => { loadavg: [0.1, 11, 0.1] } },
-            { 'pve_node_name' => { loadavg: [0.1, 11, 0.1] } },
-            { 'pve_node_name' => { loadavg: [0.1, 9, 0.1] } }
-          ])
+          mock_proxmox(
+            mocked_pve_nodes: [
+              { 'pve_node_name' => { loadavg: [0.1, 11, 0.1] } },
+              { 'pve_node_name' => { loadavg: [0.1, 11, 0.1] } },
+              { 'pve_node_name' => { loadavg: [0.1, 9, 0.1] } }
+            ]
+          )
           expect(call_reserve_proxmox_container(2, 1024, 4, max_retries: 5)).to eq(
             pve_node: 'pve_node_name',
             vm_id: 1000,
@@ -51,7 +53,7 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
           mock_proxmox(mocked_pve_nodes: [{ 'pve_node_name' => { error_strings: ['NOK: error code = 500'] * 5 } }])
           result = call_reserve_proxmox_container(2, 1024, 4, config: { api_max_retries: 4 })
           expect(result[:error]).not_to eq nil
-          expect(result[:error]).to match /Unhandled exception from reserve_proxmox_container: Proxmox API get nodes\/pve_node_name\/lxc returns NOK: error code = 500 continuously \(tried 5 times\)/
+          expect(result[:error]).to match(%r{Unhandled exception from reserve_proxmox_container: Proxmox API get nodes/pve_node_name/lxc returns NOK: error code = 500 continuously \(tried 5 times\)})
           expect_proxmox_actions_to_be [
             [:create_ticket],
             [:create_ticket],

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/reserve_proxmox_container/vm_ids_assignment_spec.rb

@@ -2,20 +2,22 @@ require 'hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox'
 
 describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
-  context 'checking the reserve_proxmox_container sync tool' do
+  context 'when checking the reserve_proxmox_container sync tool' do
 
-    context 'checking how VM IDs are being assigned to containers' do
+    context 'when checking how VM IDs are being assigned to containers' do
 
       it 'makes sure to not use a VM ID already assigned to another container' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_name' => {
-              lxc_containers: {
-                1000 => { ip: '192.168.1.100' },
-                1001 => { ip: '192.168.1.101' }
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_name' => {
+                lxc_containers: {
+                  1000 => { ip: '192.168.1.100' },
+                  1001 => { ip: '192.168.1.101' }
+                }
               }
             }
-          })
+          )
           expect(call_reserve_proxmox_container(2, 1024, 1, config: { vm_ids_range: [1000, 1100] })).to eq(
             pve_node: 'pve_node_name',
             vm_id: 1002,
@@ -26,15 +28,17 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'makes sure to not use a VM ID already assigned to another container even on another PVE node' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_name' => {},
-            'pve_other_node_name' => {
-              lxc_containers: {
-                1000 => { ip: '192.168.1.100' },
-                1001 => { ip: '192.168.1.101' }
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_name' => {},
+              'pve_other_node_name' => {
+                lxc_containers: {
+                  1000 => { ip: '192.168.1.100' },
+                  1001 => { ip: '192.168.1.101' }
+                }
               }
             }
-          })
+          )
           expect(call_reserve_proxmox_container(2, 1024, 1, config: { vm_ids_range: [1000, 1100] })).to eq(
             pve_node: 'pve_node_name',
             vm_id: 1002,
@@ -45,33 +49,39 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
       it 'does not reserve when no VM ID is available' do
         with_sync_node do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_name' => {},
-            'pve_other_node_name' => {
-              lxc_containers: {
-                1000 => { ip: '192.168.1.100' },
-                1001 => { ip: '192.168.1.101' },
-                1002 => { ip: '192.168.1.102' },
-                1003 => { ip: '192.168.1.103' }
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_name' => {},
+              'pve_other_node_name' => {
+                lxc_containers: {
+                  1000 => { ip: '192.168.1.100' },
+                  1001 => { ip: '192.168.1.101' },
+                  1002 => { ip: '192.168.1.102' },
+                  1003 => { ip: '192.168.1.103' }
+                }
               }
             }
-          })
+          )
           expect(call_reserve_proxmox_container(2, 1024, 1, config: { vm_ids_range: [1000, 1002] })).to eq(error: 'no_available_vm_id')
         end
       end
 
       it 'makes sure to remove cgroup files that are leftovers of removed containers' do
-        with_sync_node(leftovers: [
-          '/sys/fs/cgroup/memory/lxc/1003'
-        ]) do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_name' => {
-              lxc_containers: {
-                1000 => { ip: '192.168.1.100' },
-                1001 => { ip: '192.168.1.101' }
+        with_sync_node(
+          leftovers: [
+            '/sys/fs/cgroup/memory/lxc/1003'
+          ]
+        ) do
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_name' => {
+                lxc_containers: {
+                  1000 => { ip: '192.168.1.100' },
+                  1001 => { ip: '192.168.1.101' }
+                }
               }
             }
-          })
+          )
           expect(call_reserve_proxmox_container(2, 1024, 1, config: { vm_ids_range: [1000, 1100] })).to eq(
             pve_node: 'pve_node_name',
             vm_id: 1002,
@@ -81,17 +91,21 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
       end
 
       it 'makes sure to remove cgroup files that are leftovers of removed containers even when they are reusing the VM ID' do
-        with_sync_node(leftovers: [
-          '/sys/fs/cgroup/memory/lxc/1002'
-        ]) do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_name' => {
-              lxc_containers: {
-                1000 => { ip: '192.168.1.100' },
-                1001 => { ip: '192.168.1.101' }
+        with_sync_node(
+          leftovers: [
+            '/sys/fs/cgroup/memory/lxc/1002'
+          ]
+        ) do
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_name' => {
+                lxc_containers: {
+                  1000 => { ip: '192.168.1.100' },
+                  1001 => { ip: '192.168.1.101' }
+                }
               }
             }
-          })
+          )
           expect(call_reserve_proxmox_container(2, 1024, 1, config: { vm_ids_range: [1000, 1100] })).to eq(
             pve_node: 'pve_node_name',
             vm_id: 1002,
@@ -101,19 +115,23 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
       end
 
       it 'makes sure to remove cgroup files that are leftovers of removed containers when several cgroups contain files' do
-        with_sync_node(leftovers: [
-          '/sys/fs/cgroup/memory/lxc/1003',
-          '/sys/fs/cgroup/network/lxc/1003',
-          '/sys/fs/cgroup/cpu/lxc/1003'
-        ]) do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_name' => {
-              lxc_containers: {
-                1000 => { ip: '192.168.1.100' },
-                1001 => { ip: '192.168.1.101' }
+        with_sync_node(
+          leftovers: [
+            '/sys/fs/cgroup/memory/lxc/1003',
+            '/sys/fs/cgroup/network/lxc/1003',
+            '/sys/fs/cgroup/cpu/lxc/1003'
+          ]
+        ) do
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_name' => {
+                lxc_containers: {
+                  1000 => { ip: '192.168.1.100' },
+                  1001 => { ip: '192.168.1.101' }
+                }
               }
             }
-          })
+          )
           expect(call_reserve_proxmox_container(2, 1024, 1, config: { vm_ids_range: [1000, 1100] })).to eq(
             pve_node: 'pve_node_name',
             vm_id: 1002,
@@ -135,15 +153,17 @@ describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
             '/sys/fs/cgroup/memory/lxc/1001'
           ]
         ) do
-          mock_proxmox(mocked_pve_nodes: {
-            'pve_node_name' => {
-              lxc_containers: {
-                100 => { ip: '192.168.1.10' },
-                1000 => { ip: '192.168.1.100' },
-                1001 => { ip: '192.168.1.101' }
+          mock_proxmox(
+            mocked_pve_nodes: {
+              'pve_node_name' => {
+                lxc_containers: {
+                  100 => { ip: '192.168.1.10' },
+                  1000 => { ip: '192.168.1.100' },
+                  1001 => { ip: '192.168.1.101' }
+                }
               }
             }
-          })
+          )
           expect(call_reserve_proxmox_container(2, 1024, 1, config: { vm_ids_range: [1000, 1100] })).to eq(
             pve_node: 'pve_node_name',
             vm_id: 1002,

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/start_spec.rb

@@ -2,7 +2,7 @@ require 'hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox'
 
 describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
-  context 'checking containers start' do
+  context 'when checking containers start' do
 
     it 'starts an instance' do
       with_test_proxmox_platform do |instance|

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/state_spec.rb

@@ -2,7 +2,7 @@ require 'hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox'
 
 describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
-  context 'checking containers state' do
+  context 'when checking containers state' do
 
     it 'gets the status of a missing instance' do
       with_test_proxmox_platform do |instance|

data/spec/hybrid_platforms_conductor_test/api/deployer/provisioners/proxmox/stop_spec.rb

@@ -2,7 +2,7 @@ require 'hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox'
 
 describe HybridPlatformsConductor::HpcPlugins::Provisioner::Proxmox do
 
-  context 'checking containers stop' do
+  context 'when checking containers stop' do
 
     it 'stops an instance' do
       with_test_proxmox_platform do |instance|

data/spec/hybrid_platforms_conductor_test/api/deployer/secrets_reader_plugins/cli_spec.rb

@@ -1,50 +1,51 @@
 describe HybridPlatformsConductor::Deployer do
 
-  context 'checking secrets_reader plugins' do
+  context 'when checking secrets_reader plugins' do
 
-    context 'cli' do
+    context 'with cli' do
 
       # Setup a platform for tests
       #
       # Parameters::
-      # * Proc: Code called when the platform is setup
+      # * *block* (Proc): Code called when the platform is setup
       #   * Parameters::
       #     * *repository* (String): Platform's repository
-      def with_test_platform_for_cli_test
+      def with_test_platform_for_cli_test(&block)
         with_test_platform(
-          { nodes: { 'node' => { services: %w[service] } } },
-          false,
-          'read_secrets_from :cli'
-        ) do |repository|
-          yield repository
-        end
+          {
+            nodes: { 'node' => { services: %w[service] } },
+            deployable_services: %w[service]
+          },
+          additional_config: 'read_secrets_from :cli',
+          &block
+        )
       end
 
       it 'gets secrets from a file' do
         with_test_platform_for_cli_test do |repository|
           secrets_file = "#{repository}/my_secrets.json"
           File.write(secrets_file, '{ "secret_name": "secret_value" }')
-          expect(test_services_handler).to receive(:deploy_allowed?).with(
+          expect(test_services_handler).to receive(:package).with(
             services: { 'node' => %w[service] },
             secrets: { 'secret_name' => 'secret_value' },
             local_environment: false
-          ) { 'Abort as testing secrets is enough' }
-          expect { run 'deploy', '--node', 'node', '--secrets', secrets_file }.to raise_error 'Deployment not allowed: Abort as testing secrets is enough'
+          ) { raise 'Abort as testing secrets is enough' }
+          expect { run 'deploy', '--node', 'node', '--secrets', secrets_file }.to raise_error 'Abort as testing secrets is enough'
         end
       end
 
       it 'gets secrets from several files' do
         with_test_platform_for_cli_test do |repository|
-          secrets_file1 = "#{repository}/my_secrets1.json"
-          File.write(secrets_file1, '{ "secret1": "value1" }')
-          secrets_file2 = "#{repository}/my_secrets2.json"
-          File.write(secrets_file2, '{ "secret2": "value2" }')
-          expect(test_services_handler).to receive(:deploy_allowed?).with(
+          secrets_file_1 = "#{repository}/my_secrets1.json"
+          File.write(secrets_file_1, '{ "secret1": "value1" }')
+          secrets_file_2 = "#{repository}/my_secrets2.json"
+          File.write(secrets_file_2, '{ "secret2": "value2" }')
+          expect(test_services_handler).to receive(:package).with(
             services: { 'node' => %w[service] },
             secrets: { 'secret1' => 'value1', 'secret2' => 'value2' },
             local_environment: false
-          ) { 'Abort as testing secrets is enough' }
-          expect { run 'deploy', '--node', 'node', '--secrets', secrets_file1, '--secrets', secrets_file2 }.to raise_error 'Deployment not allowed: Abort as testing secrets is enough'
+          ) { raise 'Abort as testing secrets is enough' }
+          expect { run 'deploy', '--node', 'node', '--secrets', secrets_file_1, '--secrets', secrets_file_2 }.to raise_error 'Abort as testing secrets is enough'
         end
       end