spec/mysql_spec.rb in em-synchrony-0.1.2 vs spec/mysql_spec.rb in em-synchrony-0.1.4

@@ -5,27 +5,25 @@
 QUERY = "select sleep(#{DELAY})"
 
 describe EventMachine::MySQL do
 
   it "should fire sequential, synchronous requests" do
-    EventMachine.run do
-      Fiber.new {
-        db = EventMachine::MySQL.new(host: "localhost")
-        start = now
-        res = []
+    EventMachine.synchrony do
+      db = EventMachine::MySQL.new(host: "localhost")
+      start = now
+      res = []
 
-        res.push db.query(QUERY)
-        res.push db.query(QUERY)
-        (now - start.to_f).should be_within(DELAY * res.size * 0.15).of(DELAY * res.size)
+      res.push db.query(QUERY)
+      res.push db.query(QUERY)
+      (now - start.to_f).should be_within(DELAY * res.size * 0.15).of(DELAY * res.size)
 
-        EventMachine.stop
-      }.resume
+      EventMachine.stop
     end
   end
 
   it "should have accept a callback, errback on async queries" do
-    EventMachine.run do
+    EventMachine.synchrony do
       db = EventMachine::MySQL.new(host: "localhost")
 
       res = db.aquery(QUERY)
       res.errback {|r| fail }
       res.callback {|r|
@@ -34,60 +32,56 @@
       }
     end
   end
 
   it "should fire simultaneous requests via Multi interface" do
-    EventMachine.run do
+    EventMachine.synchrony do
 
       db = EventMachine::Synchrony::ConnectionPool.new(size: 2) do
         EventMachine::MySQL.new(host: "localhost")
       end
 
-      Fiber.new {
-        start = now
+      start = now
 
-        multi = EventMachine::Synchrony::Multi.new
-        multi.add :a, db.aquery(QUERY)
-        multi.add :b, db.aquery(QUERY)
-        res = multi.perform
+      multi = EventMachine::Synchrony::Multi.new
+      multi.add :a, db.aquery(QUERY)
+      multi.add :b, db.aquery(QUERY)
+      res = multi.perform
 
-        (now - start.to_f).should be_within(DELAY * 0.15).of(DELAY)
-        res.responses[:callback].size.should == 2
-        res.responses[:errback].size.should == 0
+      (now - start.to_f).should be_within(DELAY * 0.15).of(DELAY)
+      res.responses[:callback].size.should == 2
+      res.responses[:errback].size.should == 0
 
-        EventMachine.stop
-      }.resume
+      EventMachine.stop
     end
   end
 
   it "should fire sequential and simultaneous MySQL requests" do
-    EventMachine.run do
+    EventMachine.synchrony do
       db = EventMachine::Synchrony::ConnectionPool.new(size: 3) do
         EventMachine::MySQL.new(host: "localhost")
       end
 
-      Fiber.new {
-        start = now
-        res = []
+      start = now
+      res = []
 
-        res.push db.query(QUERY)
-        res.push db.query(QUERY)
-        (now - start.to_f).should be_within(DELAY * res.size * 0.15).of(DELAY * res.size)
+      res.push db.query(QUERY)
+      res.push db.query(QUERY)
+      (now - start.to_f).should be_within(DELAY * res.size * 0.15).of(DELAY * res.size)
 
-        start = now
+      start = now
 
-        multi = EventMachine::Synchrony::Multi.new
-        multi.add :a, db.aquery(QUERY)
-        multi.add :b, db.aquery(QUERY)
-        multi.add :c, db.aquery(QUERY)
-        res = multi.perform
+      multi = EventMachine::Synchrony::Multi.new
+      multi.add :a, db.aquery(QUERY)
+      multi.add :b, db.aquery(QUERY)
+      multi.add :c, db.aquery(QUERY)
+      res = multi.perform
 
-        (now - start.to_f).should be_within(DELAY * 0.15).of(DELAY)
-        res.responses[:callback].size.should == 3
-        res.responses[:errback].size.should == 0
+      (now - start.to_f).should be_within(DELAY * 0.15).of(DELAY)
+      res.responses[:callback].size.should == 3
+      res.responses[:errback].size.should == 0
 
-        EventMachine.stop
-      }.resume
+      EventMachine.stop
     end
   end
 
-end
+end
\ No newline at end of file