Use scheduler context for container tests

Author: samuel-williams-shopify

fixtures/container_context.rb

@@ -10,11 +10,8 @@
 require "async"
 
 require "sus/fixtures/async/scheduler_context"
-require "container_context"
 
 describe Async::Service::Managed::Service do
-	include ContainerContext
-	
 	let(:configuration) do
 		Async::Service::Configuration.build do
 			service "test-container" do
@@ -350,6 +347,8 @@ def name = @name
 	end
 
 	with "integration test with controller" do
+		include Sus::Fixtures::Async::SchedulerContext
+		
 		let(:configuration) do
 			Async::Service::Configuration.build do
 				service "test-managed" do
@@ -368,16 +367,14 @@ def name = @name
 		let(:controller) {Async::Service::Controller.for(test_service)}
 
 		it "runs service with health checking and no restarts when async context is present" do
-			container_context do
-				container = Async::Container.new
-				
-				controller.setup(container)
-				controller.start
-				sleep(0.03)
-			ensure
-				controller.stop
-				container&.stop
-			end
+			container = Async::Container.new
+			
+			controller.setup(container)
+			controller.start
+			sleep(0.03)
+		ensure
+			controller.stop
+			container&.stop
 		end
 	end
 end

test/async/service/managed/service.rb

@@ -6,11 +6,9 @@
 require "async/container/best"
 require "async/service/policy"
 require "async/container/statistics"
-require "container_context"
+require "sus/fixtures/async/scheduler_context"
 
 describe Async::Service::Policy do
-	include ContainerContext
-	
 	let(:policy) {subject.new(maximum_failures: 5, window: 10)}
 
 	with "::DEFAULT" do
@@ -163,29 +161,29 @@ def success_status.success?; true; end
 	end
 
 	with "concurrent failures" do
+		include Sus::Fixtures::Async::SchedulerContext
+		
 		it "only stops container once when multiple children fail simultaneously" do
-			container_context do
-				container = Async::Container.best_container_class.new(policy: policy)
-				stop_count = 0
-				original_stop = container.method(:stop)
-				
-				container.define_singleton_method(:stop) do |*arguments|
-					stop_count += 1
-					original_stop.call(*arguments)
-				end
-				
-				# Spawn 10 children that all fail immediately:
-				10.times do |i|
-					container.spawn(name: "worker-#{i}") do |instance|
-						instance.ready!
-						exit(1)
-					end
+			container = Async::Container.best_container_class.new(policy: policy)
+			stop_count = 0
+			original_stop = container.method(:stop)
+			
+			container.define_singleton_method(:stop) do |*arguments|
+				stop_count += 1
+				original_stop.call(*arguments)
+			end
+			
+			# Spawn 10 children that all fail immediately:
+			10.times do |i|
+				container.spawn(name: "worker-#{i}") do |instance|
+					instance.ready!
+					exit(1)
 				end
-				
-				container.wait
-				
-				expect(stop_count).to be == 1
 			end
+			
+			container.wait
+			
+			expect(stop_count).to be == 1
 		end
 	end
 end