Sort output to fix random breakage in the test suite.

[haeredes.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 679a1ac1fe1d0dc3cf684420596676dde91e10e5..c9356bfd9318de6d96c279d0bd9dd0608fe9b332 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,4 +1,4 @@
-module Main
+module Main (main)
 where
 
 import Control.Concurrent.ParallelIO.Global (
@@ -9,61 +9,78 @@ import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
   words )
-import Data.List ((\\))
-import Data.String.Utils (join)
+import Data.List ( (\\), intersperse, sort )
 import Network.DNS (
+  DNSError(NameError),
   Domain,
   FileOrNumericHost(RCHostName),
   ResolvConf(resolvInfo, resolvTimeout),
   defaultResolvConf,
   makeResolvSeed,
+  normalize,
+  normalizeCase,
   withResolver )
-import System.Exit (ExitCode(..), exitWith)
+import System.Exit (ExitCode(ExitFailure), exitWith)
 import System.IO (hPutStrLn, stderr)
 
-
-import CommandLine (Args(..), get_args)
+import CommandLine (
+   Args(NS,MX,delegates,no_append_root,server,timeout),
+   get_args)
 import DNS (
   LookupResult,
   lookupMX',
   lookupNS',
-  normalize,
-  normalize_case,
   resolve_address )
 import ExitCodes (exit_bad_server)
-import Timeout (Timeout(..))
+import Timeout (Timeout(seconds))
 
 
 -- | Given a list of delegates, report results for this
---   LookupResult.
+--   'LookupResult'.
 --
 --   If there's an empty list in the second component, there were no
 --   query results, so we report that the domain was not delegated. If
 --   there were some results and there are leftovers (after removing
 --   the delegates), we report those as well.
 --
+--   Before processing, all names are normalized using the supplied
+--   function @normalize_function@. Ideally this should be the same
+--   function applied to the user-input names.
+--
 report :: [Domain] -- ^ The list of @delgts@
+       -> (Domain -> Domain) -- ^ Domain name normalization function,
+                             --   @normalize_function@.
        -> LookupResult
        -> IO ()
 
--- If the lookup resulted in a DNS error, we just ignore the whole
--- thing.
-report _ (_, Left _) = return ()
-
 -- If the lookup succeeded but there were no results, report that the
--- domain is not delegated.
-report _ (d, Right []) =
+-- domain is not delegated. Note that the behavior of the DNS library
+-- changed with regard to this at some point: we used to get back
+-- a "success," but with an empty list of results. Now a NameError
+-- (which is not actually an error!) is returned.
+report _ _ (d, Left NameError) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 
+-- If the lookup resulted in some other DNS error, we just ignore the
+-- whole thing.
+report _ _ (_, Left _) = return ()
+
 -- Otherwise, subtract our delegates from the list of results and
 -- report the leftovers.
-report delgts (d, Right hosts) = do
-  let leftovers = hosts \\ delgts
+report delgts normalize_function (d, Right raw_hosts) = do
+  let nrml_hosts = map normalize_function raw_hosts
+  -- Sort the leftovers so that we can test the expected output.
+  let leftovers = sort (nrml_hosts \\ delgts)
   unless (null leftovers) $
     putStrLn $ "Domain " ++
                (show d) ++
                " delegates somewhere else: " ++
                (join " " (map show leftovers))
+  where
+    -- Create one big string by joining together a list of smaller
+    -- strings and placing a delimiter between them.
+    join :: String -> [String] -> String
+    join delimiter strings = concat (intersperse delimiter strings)
 
 
 main :: IO ()
@@ -81,7 +98,7 @@ main = do
 
   let normalize_function =
         if (no_append_root cfg)
-        then normalize_case
+        then normalizeCase
         else normalize
 
   -- Normalize the given names and delegates
@@ -106,7 +123,8 @@ main = do
 
   -- Set the timeout from the command line. The resolvTimeout field is
   -- in microseconds, so we multiply by one million.
-  let rc = rc' { resolvTimeout = 1000 * 1000 * seconds (timeout cfg) }
+  let a_million = 1000 * 1000 :: Int
+  let rc = rc' { resolvTimeout = a_million * seconds (timeout cfg) }
   rs <- makeResolvSeed rc
 
   let lookup_function = case cfg of
@@ -124,6 +142,6 @@ main = do
   results <- parallelInterleaved actions
 
   -- Output the results.
-  _ <- mapM (report nrml_delegates) results
+  _ <- mapM (report nrml_delegates normalize_function) results
 
   stopGlobalPool