1 files changed, 30 insertions, 17 deletions

diff --git a/tests/Network/BitTorrent/Tracker/RPCSpec.hs b/tests/Network/BitTorrent/Tracker/RPCSpec.hs
index c3c7f9e2..3b89714c 100644
--- a/tests/Network/BitTorrent/Tracker/RPCSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPCSpec.hs
@@ -1,37 +1,50 @@
+{-# LANGUAGE RecordWildCards #-}
 module Network.BitTorrent.Tracker.RPCSpec (spec) where
 import Control.Applicative
 import Control.Monad
 import Data.Default
 import Data.List as L
-import Network.URI
 import Test.Hspec
 import Test.QuickCheck
 
-import Network.BitTorrent.Tracker.MessageSpec hiding (spec)
-import Network.BitTorrent.Tracker.RPC.HTTPSpec as HTTP hiding (spec)
-import Network.BitTorrent.Tracker.RPC.UDPSpec as UDP hiding (spec)
 import Network.BitTorrent.Tracker.RPC as RPC
 
-uris :: [URI]
-uris = UDP.trackerURIs ++ HTTP.trackerURIs
+import           Network.BitTorrent.Tracker.TestData
+import           Network.BitTorrent.Tracker.MessageSpec hiding (spec)
+import qualified Network.BitTorrent.Tracker.RPC.UDPSpec as UDP (rpcOpts)
+
 
 instance Arbitrary SAnnounceQuery where
   arbitrary = SAnnounceQuery <$> arbitrary <*> arbitrary
                              <*> arbitrary <*> arbitrary
 
+rpcOpts :: Options
+rpcOpts = def
+  { optUdpRPC = UDP.rpcOpts
+  }
+
 spec :: Spec
 spec = do
-  forM_ uris $ \ uri ->
-    context (show uri) $ do
+  forM_ trackers $ \ TrackerEntry {..} ->
+    context trackerName $ do
+
       describe "announce" $ do
-        it "have valid response" $ do
-          withManager def def $ \ mgr -> do
-            q    <- arbitrarySample
-            _    <- announce mgr uri q
-            return ()
+        if tryAnnounce then do
+          it "have valid response" $ do
+            withManager rpcOpts def $ \ mgr -> do
+              q    <- arbitrarySample
+              _    <- announce mgr trackerURI q
+              return ()
+        else do
+          it "should throw exception" $ do
+            pending
 
       describe "scrape" $ do
-        it "have valid response" $ do
-          withManager def def $ \ mgr -> do
-            xs <- scrape mgr uri [def]
-            L.length xs `shouldSatisfy` (>= 1)
+        if tryScraping then do
+          it "have valid response" $ do
+            withManager rpcOpts def $ \ mgr -> do
+              xs <- scrape mgr trackerURI [def]
+              L.length xs `shouldSatisfy` (>= 1)
+        else do
+          it "should throw exception" $ do
+            pending