2 files changed, 27 insertions, 13 deletions

diff --git a/tests/Config.hs b/tests/Config.hs
index 3dea6603..b37b727b 100644
--- a/tests/Config.hs
+++ b/tests/Config.hs
@@ -11,8 +11,12 @@ module Config
          -- * For item specs
        , getEnvOpts
        , getThisOpts
+       , getMyAddr
+
        , getRemoteOpts
        , withRemote
+       , withRemoteAddr
+
        , getTestTorrent
        ) where
 
@@ -29,6 +33,7 @@ import System.IO.Unsafe
 import Test.Hspec
 
 import Data.Torrent
+import Network.BitTorrent.Core (IP, PeerAddr (PeerAddr), genPeerId)
 
 
 type ClientName = String
@@ -138,6 +143,17 @@ withRemote action = do
     Nothing   -> pendingWith "Remote client isn't running"
     Just opts -> action opts
 
+withRemoteAddr :: (PeerAddr IP -> Expectation) -> Expectation
+withRemoteAddr action = do
+  withRemote $ \ ClientOpts {..} ->
+    action (PeerAddr Nothing "0.0.0.0" peerPort)
+
+getMyAddr :: IO (PeerAddr (Maybe IP))
+getMyAddr = do
+  ClientOpts {..} <- getThisOpts
+  pid <- genPeerId
+  return $ PeerAddr (Just pid) Nothing peerPort
+
 getTestTorrent :: IO Torrent
 getTestTorrent = do
   EnvOpts {..} <- getEnvOpts
diff --git a/tests/Network/BitTorrent/Exchange/SessionSpec.hs b/tests/Network/BitTorrent/Exchange/SessionSpec.hs
index 9f6f11a1..745649fe 100644
--- a/tests/Network/BitTorrent/Exchange/SessionSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/SessionSpec.hs
@@ -1,31 +1,29 @@
+{-# LANGUAGE RecordWildCards #-}
 module Network.BitTorrent.Exchange.SessionSpec (spec) where
 import Test.Hspec
 
 import Data.Torrent
 import Network.BitTorrent.Core
-import Network.BitTorrent.Exchange.Session
+import Network.BitTorrent.Exchange.Session as S
 
 import Config
 
 
 nullLogger :: LogFun
-nullLogger _ _ _ _ = return ()
-
-getMyAddr :: IO (PeerAddr (Maybe IP))
-getMyAddr = undefined
+nullLogger _ _ x _ = print x
 
 spec :: Spec
 spec = do
   describe "metadata exchange" $ do
     it "should fetch info dictionary" $ do
-      pending
-{-
-      Torrent {..} <- getTestTorrent
-      ses  <- newSession nullLogger addr "" tInfoDict
-      dict <- waitMetadata ses
-      closeSession ses
-      dict `shouldBe` tInfoDict
--}
+      withRemoteAddr $ \ addr -> do
+        Torrent {..} <- getTestTorrent
+        myAddr <- getMyAddr
+        ses  <- newSession nullLogger myAddr "" tInfoDict
+        S.insert addr ses
+        dict <- waitMetadata ses
+        closeSession ses
+        dict `shouldBe` tInfoDict
 
     it "should serve info dictionary" $ do
       pending