Fix cassette naming within spec abstracts

jimcroft · Jan 15, 2016 · aa52d61 · aa52d61
1 parent bce78da
commit aa52d61
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/lib/miasma/specs/compute_abstract.rb b/lib/miasma/specs/compute_abstract.rb
@@ -31,7 +31,7 @@
 
       before do
         unless($miasma_instance)
-          VCR.use_cassette('Miasma_Models_Compute_Aws/GLOBAL_compute_instance_create') do
+          VCR.use_cassette('Miasma_Models_Compute_Global/GLOBAL_compute_instance_create') do
             @instance = compute.servers.build(build_args)
             @instance.save
             until(@instance.state == :running)
@@ -41,7 +41,7 @@
             $miasma_instance = @instance
           end
           Kernel.at_exit do
-            VCR.use_cassette('Miasma_Models_Compute_Aws/GLOBAL_compute_instance_destroy') do
+            VCR.use_cassette('Miasma_Models_Compute_Global/GLOBAL_compute_instance_destroy') do
               $miasma_instance.destroy
             end
           end

diff --git a/lib/miasma/specs/load_balancer_abstract.rb b/lib/miasma/specs/load_balancer_abstract.rb
@@ -31,7 +31,7 @@
 
       before do
         unless($miasma_balancer)
-          VCR.use_cassette('Miasma_Models_LoadBalancer_Aws/GLOBAL_load_balancer_create') do
+          VCR.use_cassette('Miasma_Models_LoadBalancer_Global/GLOBAL_load_balancer_create') do
             @balancer = load_balancer.balancers.build(build_args)
             @balancer.save
             until(@balancer.state == :active)
@@ -41,7 +41,7 @@
             $miasma_balancer = @balancer
           end
           Kernel.at_exit do
-            VCR.use_cassette('Miasma_Models_LoadBalancer_Aws/GLOBAL_load_balancer_destroy') do
+            VCR.use_cassette('Miasma_Models_LoadBalancer_Global/GLOBAL_load_balancer_destroy') do
               $miasma_balancer.destroy
             end
           end

diff --git a/lib/miasma/specs/orchestration_abstract.rb b/lib/miasma/specs/orchestration_abstract.rb
@@ -1,3 +1,5 @@
+require 'timeout'
+
 MIASMA_ORCHESTRATION_ABSTRACT = ->{
 
   # Required `let`s:
@@ -31,19 +33,21 @@
 
       before do
         unless($miasma_stack)
-          VCR.use_cassette('Miasma_Models_Orchestration_Aws/GLOBAL_orchestration_stack_create') do
+          VCR.use_cassette('Miasma_Models_Orchestration_Global/GLOBAL_orchestration_stack_create') do
             @stack = orchestration.stacks.build(build_args)
             @stack.save
-            until(@stack.state == :create_complete)
-              miasma_spec_sleep
-              @stack.reload
+            Timeout.timeout(500) do
+              until(@stack.state == :create_complete)
+                miasma_spec_sleep
+                @stack.reload
+              end
             end
             @stack.template
             orchestration.stacks.reload
             $miasma_stack = @stack
           end
           Kernel.at_exit do
-            VCR.use_cassette('Miasma_Models_Compute_Aws/GLOBAL_orchestration_stack_destroy') do
+            VCR.use_cassette('Miasma_Models_Compute_Global/GLOBAL_orchestration_stack_destroy') do
               $miasma_stack.destroy
             end
           end
@@ -108,9 +112,11 @@
         stack.state.must_equal :create_complete
         stack.destroy
         [:delete_in_progress, :delete_complete].must_include stack.state
-        until(stack.state == :delete_complete)
-          miasma_spec_sleep
-          stack.reload
+        Timeout.timeout(500) do
+          until(stack.state == :delete_complete)
+            miasma_spec_sleep
+            stack.reload
+          end
         end
         stack.state.must_equal :delete_complete
       end