gnu/packages/patches/ngircd-no-dns-in-tests.patch

   1 From 3f807e104572b38143a1015be57d875088ceaebb Mon Sep 17 00:00:00 2001
   2 From: Alexander Barton <alex@barton.de>
   3 Date: Thu, 17 Apr 2014 23:57:38 +0200
   4 Subject: [PATCH] Test suite: Don't use DNS lookups
   5
   6 Different operating systems do behave quite differently when doing DNS
   7 lookups, for example "127.0.0.1" sometimes resolves to "localhost" and
   8 sometimes to "localhost.localdomain" (for example OpenBSD). And other
   9 systems resolve "localhost" to the real host name (for example Cygwin).
  10
  11 So not using DNS at all makes the test site much more portable.
  12 ---
  13  src/testsuite/channel-test.e        |  2 +-
  14  src/testsuite/check-idle.e          |  2 +-
  15  src/testsuite/connect-test.e        |  2 +-
  16  src/testsuite/invite-test.e         |  2 +-
  17  src/testsuite/join-test.e           |  2 +-
  18  src/testsuite/kick-test.e           |  2 +-
  19  src/testsuite/message-test.e        | 31 ++++++++++++-------------------
  20  src/testsuite/misc-test.e           |  8 ++++----
  21  src/testsuite/mode-test.e           |  2 +-
  22  src/testsuite/ngircd-test1.conf     |  1 +
  23  src/testsuite/ngircd-test2.conf     |  1 +
  24  src/testsuite/opless-channel-test.e |  2 +-
  25  src/testsuite/server-link-test.e    |  2 +-
  26  src/testsuite/stress-A.e            |  2 +-
  27  src/testsuite/who-test.e            |  6 +++---
  28  src/testsuite/whois-test.e          | 14 +++++++-------
  29  16 files changed, 38 insertions(+), 43 deletions(-)
  30
  31 diff --git a/src/testsuite/channel-test.e b/src/testsuite/channel-test.e
  32 index dd7eb66..39ad16a 100644
  33 --- a/src/testsuite/channel-test.e
  34 +++ b/src/testsuite/channel-test.e
  35 @@ -1,7 +1,7 @@
  36  # ngIRCd test suite
  37  # Channel test
  38
  39 -spawn telnet localhost 6789
  40 +spawn telnet 127.0.0.1 6789
  41  expect {
  42         timeout { exit 1 }
  43         "Connected"
  44 diff --git a/src/testsuite/check-idle.e b/src/testsuite/check-idle.e
  45 index 41b8eb4..ad112b2 100644
  46 --- a/src/testsuite/check-idle.e
  47 +++ b/src/testsuite/check-idle.e
  48 @@ -1,7 +1,7 @@
  49  # ngIRCd test suite
  50  # Idle test
  51
  52 -spawn telnet localhost 6789
  53 +spawn telnet 127.0.0.1 6789
  54  expect {
  55         timeout { exit 1 }
  56         "Connected"
  57 diff --git a/src/testsuite/connect-test.e b/src/testsuite/connect-test.e
  58 index 662f5f7..b51be0d 100644
  59 --- a/src/testsuite/connect-test.e
  60 +++ b/src/testsuite/connect-test.e
  61 @@ -1,7 +1,7 @@
  62  # ngIRCd test suite
  63  # Server connect test
  64
  65 -spawn telnet localhost 6789
  66 +spawn telnet 127.0.0.1 6789
  67  expect {
  68         timeout { exit 1 }
  69         "Connected"
  70 diff --git a/src/testsuite/invite-test.e b/src/testsuite/invite-test.e
  71 index 3716d19..5179d8a 100644
  72 --- a/src/testsuite/invite-test.e
  73 +++ b/src/testsuite/invite-test.e
  74 @@ -1,7 +1,7 @@
  75  # ngIRCd test suite
  76  # INVITE test
  77
  78 -spawn telnet localhost 6789
  79 +spawn telnet 127.0.0.1 6789
  80  expect {
  81         timeout { exit 1 }
  82         "Connected"
  83 diff --git a/src/testsuite/join-test.e b/src/testsuite/join-test.e
  84 index 28b4c54..c088f5c 100644
  85 --- a/src/testsuite/join-test.e
  86 +++ b/src/testsuite/join-test.e
  87 @@ -1,7 +1,7 @@
  88  # ngIRCd test suite
  89  # JOIN test
  90
  91 -spawn telnet localhost 6789
  92 +spawn telnet 127.0.0.1 6789
  93  expect {
  94         timeout { exit 1 }
  95         "Connected"
  96 diff --git a/src/testsuite/kick-test.e b/src/testsuite/kick-test.e
  97 index 3d3c1ee..89da611 100644
  98 --- a/src/testsuite/kick-test.e
  99 +++ b/src/testsuite/kick-test.e
 100 @@ -1,7 +1,7 @@
 101  # ngIRCd test suite
 102  # KICK test
 103
 104 -spawn telnet localhost 6789
 105 +spawn telnet 127.0.0.1 6789
 106  expect {
 107         timeout { exit 1 }
 108         "Connected"
 109 diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e
 110 index 0e70640..5dc325d 100644
 111 --- a/src/testsuite/message-test.e
 112 +++ b/src/testsuite/message-test.e
 113 @@ -1,7 +1,7 @@
 114  # ngIRCd test suite
 115  # PRIVMSG and NOTICE test
 116
 117 -spawn telnet localhost 6789
 118 +spawn telnet 127.0.0.1 6789
 119  expect {
 120         timeout { exit 1 }
 121         "Connected"
 122 @@ -72,24 +72,17 @@ expect {
 123         "MODE nick :-b"
 124  }
 125
 126 -# The following two tests using "localhost" as host name
 127 -# had to be disabled, because there are operating systems
 128 -# out there, that use "localhost.<domain>" as host name
 129 -# for 127.0.0.1 instead of just "localhost".
 130 -# (for example OpenBSD 4, OpenSolaris, ...)
 131 -#
 132 -#send "privmsg ~user\%localhost :test\r"
 133 -#expect {
 134 -#      timeout { exit 1 }
 135 -#      "@* PRIVMSG nick :test"
 136 -#}
 137 -#
 138 -#send "privmsg Nick!~User@LocalHost :test\r"
 139 -#expect {
 140 -#      timeout { exit 1 }
 141 -#      "@* PRIVMSG nick :test"
 142 -#      "401"
 143 -#}
 144 +send "privmsg ~user\%127.0.0.1 :test\r"
 145 +expect {
 146 +       timeout { exit 1 }
 147 +       "@* PRIVMSG nick :test"
 148 +}
 149 +
 150 +send "privmsg Nick!~User@127.0.0.1 :test\r"
 151 +expect {
 152 +       timeout { exit 1 }
 153 +       "@* PRIVMSG nick :test"
 154 +}
 155
 156  send "away :away\r"
 157  expect {
 158 diff --git a/src/testsuite/misc-test.e b/src/testsuite/misc-test.e
 159 index a83bc5b..f69e7c3 100644
 160 --- a/src/testsuite/misc-test.e
 161 +++ b/src/testsuite/misc-test.e
 162 @@ -1,7 +1,7 @@
 163  # ngIRCd test suite
 164  # Misc test
 165
 166 -spawn telnet localhost 6789
 167 +spawn telnet 127.0.0.1 6789
 168  expect {
 169         timeout { exit 1 }
 170         "Connected"
 171 @@ -130,7 +130,7 @@ expect {
 172  send "userhost nick\r"
 173  expect {
 174         timeout { exit 1 }
 175 -       -re ":ngircd.test.server 302 nick :?nick=+.*@(localhos.*|127.0.0.1)"
 176 +       -re ":ngircd.test.server 302 nick :?nick=+.*@127.0.0.1"
 177  }
 178
 179  send "userhost doesnotexist\r"
 180 @@ -142,7 +142,7 @@ expect {
 181  send "userhost nick doesnotexist nick doesnotexist\r"
 182  expect {
 183         timeout { exit 1 }
 184 -       -re ":ngircd.test.server 302 nick :nick=+.*@(localhos.*|127.0.0.1) nick=+.*@(localhos.*|127.0.0.1)"
 185 +       -re ":ngircd.test.server 302 nick :nick=+.*@127.0.0.1 nick=+.*@127.0.0.1"
 186  }
 187
 188  send "away :testing\r"
 189 @@ -154,7 +154,7 @@ expect {
 190  send "userhost nick nick nick nick nick nick\r"
 191  expect {
 192         timeout { exit 1 }
 193 -       -re ":ngircd.test.server 302 nick :nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1)\r"
 194 +       -re ":ngircd.test.server 302 nick :nick=-.*@127.0.0.1 nick=-.*@127.0.0.1 nick=-.*@127.0.0.1 nick=-.*@127.0.0.1 nick=-.*@127.0.0.1\r"
 195  }
 196
 197  send "quit\r"
 198 diff --git a/src/testsuite/mode-test.e b/src/testsuite/mode-test.e
 199 index d6726a4..86e4f2d 100644
 200 --- a/src/testsuite/mode-test.e
 201 +++ b/src/testsuite/mode-test.e
 202 @@ -1,7 +1,7 @@
 203  # ngIRCd test suite
 204  # MODE test
 205
 206 -spawn telnet localhost 6789
 207 +spawn telnet 127.0.0.1 6789
 208  expect {
 209         timeout { exit 1 }
 210         "Connected"
 211 diff --git a/src/testsuite/ngircd-test1.conf b/src/testsuite/ngircd-test1.conf
 212 index 0d0cccc..4dec533 100644
 213 --- a/src/testsuite/ngircd-test1.conf
 214 +++ b/src/testsuite/ngircd-test1.conf
 215 @@ -17,6 +17,7 @@
 216         OperCanUseMode = yes
 217         Ident = no
 218         IncludeDir = /var/empty
 219 +       DNS = no
 220         PAM = no
 221
 222  [Operator]
 223 diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf
 224 index c9d7f6c..0d24c4a 100644
 225 --- a/src/testsuite/ngircd-test2.conf
 226 +++ b/src/testsuite/ngircd-test2.conf
 227 @@ -17,6 +17,7 @@
 228         OperCanUseMode = yes
 229         Ident = no
 230         IncludeDir = /var/empty
 231 +       DNS = no
 232         PAM = no
 233
 234  [Operator]
 235 diff --git a/src/testsuite/opless-channel-test.e b/src/testsuite/opless-channel-test.e
 236 index 7d94172..4611fe1 100644
 237 --- a/src/testsuite/opless-channel-test.e
 238 +++ b/src/testsuite/opless-channel-test.e
 239 @@ -1,7 +1,7 @@
 240  # ngIRCd test suite
 241  # Op-less channel test
 242
 243 -spawn telnet localhost 6789
 244 +spawn telnet 127.0.0.1 6789
 245  expect {
 246         timeout { exit 1 }
 247         "Connected"
 248 diff --git a/src/testsuite/server-link-test.e b/src/testsuite/server-link-test.e
 249 index cf3fae8..910f8c8 100644
 250 --- a/src/testsuite/server-link-test.e
 251 +++ b/src/testsuite/server-link-test.e
 252 @@ -1,7 +1,7 @@
 253  # ngIRCd test suite
 254  # server-server link test
 255
 256 -spawn telnet localhost 6790
 257 +spawn telnet 127.0.0.1 6790
 258  expect {
 259         timeout { exit 1 }
 260         "Connected"
 261 diff --git a/src/testsuite/stress-A.e b/src/testsuite/stress-A.e
 262 index 256d5d1..d51adaa 100644
 263 --- a/src/testsuite/stress-A.e
 264 +++ b/src/testsuite/stress-A.e
 265 @@ -3,7 +3,7 @@
 266
 267  set timeout 30
 268
 269 -spawn telnet localhost 6789
 270 +spawn telnet 127.0.0.1 6789
 271  expect {
 272         timeout { exit 1 }
 273         "Connected"
 274 diff --git a/src/testsuite/who-test.e b/src/testsuite/who-test.e
 275 index a41e6b6..39d50ed 100644
 276 --- a/src/testsuite/who-test.e
 277 +++ b/src/testsuite/who-test.e
 278 @@ -1,7 +1,7 @@
 279  # ngIRCd test suite
 280  # WHO test
 281
 282 -spawn telnet localhost 6789
 283 +spawn telnet 127.0.0.1 6789
 284  expect {
 285         timeout { exit 1 }
 286         "Connected"
 287 @@ -62,7 +62,7 @@ expect {
 288         ":ngircd.test.server 352 nick #channel * * ngircd.test.server nick G@ :0 Real Name"
 289  }
 290
 291 -send "who localhos*\r"
 292 +send "who 127.0.0.*\r"
 293  expect {
 294         timeout { exit 1 }
 295         ":ngircd.test.server 352 nick \* * * ngircd.test.server nick G :0 Real Name"
 296 @@ -120,7 +120,7 @@ expect {
 297         "305 nick"
 298  }
 299
 300 -send "who ??cal*ho*\r"
 301 +send "who ??7.*0*\r"
 302  expect {
 303         timeout { exit 1 }
 304         ":ngircd.test.server 352 nick \* * * ngircd.test.server nick H* :0 Real Name"
 305 diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e
 306 index 16b1184..44eee66 100644
 307 --- a/src/testsuite/whois-test.e
 308 +++ b/src/testsuite/whois-test.e
 309 @@ -1,7 +1,7 @@
 310  # ngIRCd test suite
 311  # WHOIS test
 312
 313 -spawn telnet localhost 6789
 314 +spawn telnet 127.0.0.1 6789
 315  expect {
 316         timeout { exit 1 }
 317         "Connected"
 318 @@ -17,7 +17,7 @@ expect {
 319  send "whois nick\r"
 320  expect {
 321         timeout { exit 1 }
 322 -       "311 nick nick ~user localhost* \* :Real Name\r"
 323 +       "311 nick nick ~user 127.0.0.1 \* :Real Name\r"
 324  }
 325  expect {
 326         timeout { exit 1 }
 327 @@ -27,25 +27,25 @@ expect {
 328  send "whois *\r"
 329  expect {
 330         timeout { exit 1 }
 331 -       "311 nick nick ~user localhost* \* :Real Name\r"
 332 +       "311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 333  }
 334
 335  send "whois n*\r"
 336  expect {
 337         timeout { exit 1 }
 338 -       "311 nick nick ~user localhost* \* :Real Name\r"
 339 +       "311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 340  }
 341
 342  send "whois ?ick\r"
 343  expect {
 344         timeout { exit 1 }
 345 -       "311 nick nick ~user localhost* \* :Real Name\r"
 346 +       "311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 347  }
 348
 349  send "whois ????,n?*k\r"
 350  expect {
 351         timeout { exit 1 }
 352 -       "311 nick nick ~user localhost* \* :Real Name\r"
 353 +       "311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 354  }
 355
 356  send "whois unknown\r"
 357 @@ -61,7 +61,7 @@ expect {
 358  send "whois ngircd.test.server2 nick\r"
 359  expect {
 360         timeout { exit 1 }
 361 -       ":ngircd.test.server2 311 nick nick ~user localhost* \* :Real Name\r"
 362 +       ":ngircd.test.server2 311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 363  }
 364
 365  send "whois nosuchserver unknown\r"
 366 --
 367 1.9.1
 368