From a8ad8c1e09ea93d2b27cc08728aa375081a4d41a Mon Sep 17 00:00:00 2001
From: nick <nick@bytemark.co.uk>
Date: Tue, 15 Apr 2014 15:17:09 +0100
Subject: [PATCH] Fix the tests now that you can have multiple sockets open at
 once

---
 test/t_route.rb | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/t_route.rb b/test/t_route.rb
index d41bcb3..a9ab25c 100644
--- a/test/t_route.rb
+++ b/test/t_route.rb
@@ -1,10 +1,6 @@
 require File.expand_path( File.join(File.dirname(__FILE__), 'test_helper') )
 require 'linux/netlink/route'
 
-# Note: multiple sockets bound to the same PID seem to cause timeout problems.
-# (Should we use different algorithm for generating the PID? PID + seq?)
-$ip ||= Linux::Netlink::Route::Socket.new
-
 #
 # Ruby 1.8.7 appears to lack the KeyError constant.
 #
@@ -15,7 +11,7 @@ end
 class TestAddr < Test::Unit::TestCase
   context "With netlink route socket" do
     setup do
-      @ip = $ip
+      @ip =  Linux::Netlink::Route::Socket.new
       @ifname = nil
     end
 
@@ -25,12 +21,25 @@ class TestAddr < Test::Unit::TestCase
       rescue KeyError, IndexError
         # Do nothing
       end
+
+      @ip.close
     end
 
     test "Read link type" do
       assert_equal Linux::ARPHRD_LOOPBACK, @ip.link["lo"].type
     end
 
+    test "Both sockets work if two are open at the same time" do
+      begin
+        @ip2 = Linux::Netlink::Route::Socket.new
+
+        assert_kind_of Enumerable, @ip.route.list
+        assert_kind_of Enumerable, @ip2.route.list
+      ensure
+        @ip2.close
+      end
+    end
+
     def create_test_interface(ifname = "test_#{$$}")
       begin
         @ip.link.add(