git Service des IN-Ulm e.V. Erkunden Hilfe
Anmelden
cbiedl
/
ngircd
1
0
Fork 0
Dateien
Struktur: dd6a96d323
Branches Tags
ngircd
/
debian
/
patches
/
test-suite-dont-use-dns-lookups.patch

test-suite-dont-use-dns-lookups.patch 7.5 KB
Verlauf Originalformat

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319 
  1. Subject: Test suite: Don't use DNS lookups
    2. 

  2. Author: Alexander Barton <alex@barton.de>
    3. 

  3. Date: Thu Apr 17 23:57:38 2014 +0200
    4. 

  4. Origin:
    5. 

  5.     commit 3f807e104572b38143a1015be57d875088ceaebb
    6. 

  6. Last-Update: 2014-11-01
    7. 

  7. 

  8.     Test suite: Don't use DNS lookups
    9. 

  9.     
    10. 

  10.     Different operating systems do behave quite differently when doing DNS
    11. 

  11.     lookups, for example "127.0.0.1" sometimes resolves to "localhost" and
    12. 

  12.     sometimes to "localhost.localdomain" (for example OpenBSD). And other
    13. 

  13.     systems resolve "localhost" to the real host name (for example Cygwin).
    14. 

  14.     
    15. 

  15.     So not using DNS at all makes the test site much more portable.
    16. 

  16. 

  17. --- a/src/testsuite/channel-test.e
    18. 

  18. +++ b/src/testsuite/channel-test.e
    19. 

  19. @@ -1,7 +1,7 @@
    20. 

  20.  # ngIRCd test suite
    21. 

  21.  # Channel test
    22. 

  22.  
    23. 

  23. -spawn telnet localhost 6789
    24. 

  24. +spawn telnet 127.0.0.1 6789
    25. 

  25.  expect {
    26. 

  26.  	timeout { exit 1 }
    27. 

  27.  	"Connected"
    28. 

  28. --- a/src/testsuite/check-idle.e
    29. 

  29. +++ b/src/testsuite/check-idle.e
    30. 

  30. @@ -1,7 +1,7 @@
    31. 

  31.  # ngIRCd test suite
    32. 

  32.  # Idle test
    33. 

  33.  
    34. 

  34. -spawn telnet localhost 6789
    35. 

  35. +spawn telnet 127.0.0.1 6789
    36. 

  36.  expect {
    37. 

  37.  	timeout { exit 1 }
    38. 

  38.  	"Connected"
    39. 

  39. --- a/src/testsuite/connect-test.e
    40. 

  40. +++ b/src/testsuite/connect-test.e
    41. 

  41. @@ -1,7 +1,7 @@
    42. 

  42.  # ngIRCd test suite
    43. 

  43.  # Server connect test
    44. 

  44.  
    45. 

  45. -spawn telnet localhost 6789
    46. 

  46. +spawn telnet 127.0.0.1 6789
    47. 

  47.  expect {
    48. 

  48.  	timeout { exit 1 }
    49. 

  49.  	"Connected"
    50. 

  50. --- a/src/testsuite/invite-test.e
    51. 

  51. +++ b/src/testsuite/invite-test.e
    52. 

  52. @@ -1,7 +1,7 @@
    53. 

  53.  # ngIRCd test suite
    54. 

  54.  # INVITE test
    55. 

  55.  
    56. 

  56. -spawn telnet localhost 6789
    57. 

  57. +spawn telnet 127.0.0.1 6789
    58. 

  58.  expect {
    59. 

  59.  	timeout { exit 1 }
    60. 

  60.  	"Connected"
    61. 

  61. --- a/src/testsuite/join-test.e
    62. 

  62. +++ b/src/testsuite/join-test.e
    63. 

  63. @@ -1,7 +1,7 @@
    64. 

  64.  # ngIRCd test suite
    65. 

  65.  # JOIN test
    66. 

  66.  
    67. 

  67. -spawn telnet localhost 6789
    68. 

  68. +spawn telnet 127.0.0.1 6789
    69. 

  69.  expect {
    70. 

  70.         timeout { exit 1 }
    71. 

  71.         "Connected"
    72. 

  72. --- a/src/testsuite/kick-test.e
    73. 

  73. +++ b/src/testsuite/kick-test.e
    74. 

  74. @@ -1,7 +1,7 @@
    75. 

  75.  # ngIRCd test suite
    76. 

  76.  # KICK test
    77. 

  77.  
    78. 

  78. -spawn telnet localhost 6789
    79. 

  79. +spawn telnet 127.0.0.1 6789
    80. 

  80.  expect {
    81. 

  81.         timeout { exit 1 }
    82. 

  82.         "Connected"
    83. 

  83. --- a/src/testsuite/message-test.e
    84. 

  84. +++ b/src/testsuite/message-test.e
    85. 

  85. @@ -1,7 +1,7 @@
    86. 

  86.  # ngIRCd test suite
    87. 

  87.  # PRIVMSG and NOTICE test
    88. 

  88.  
    89. 

  89. -spawn telnet localhost 6789
    90. 

  90. +spawn telnet 127.0.0.1 6789
    91. 

  91.  expect {
    92. 

  92.  	timeout { exit 1 }
    93. 

  93.  	"Connected"
    94. 

  94. @@ -72,24 +72,17 @@ expect {
    95. 

  95.  	"MODE nick :-b"
    96. 

  96.  }
    97. 

  97.  
    98. 

  98. -# The following two tests using "localhost" as host name
    99. 

  99. -# had to be disabled, because there are operating systems
    100. 

  100. -# out there, that use "localhost.<domain>" as host name
    101. 

  101. -# for 127.0.0.1 instead of just "localhost".
    102. 

  102. -# (for example OpenBSD 4, OpenSolaris, ...)
    103. 

  103. -#
    104. 

  104. -#send "privmsg ~user\%localhost :test\r"
    105. 

  105. -#expect {
    106. 

  106. -#	timeout { exit 1 }
    107. 

  107. -#	"@* PRIVMSG nick :test"
    108. 

  108. -#}
    109. 

  109. -#
    110. 

  110. -#send "privmsg Nick!~User@LocalHost :test\r"
    111. 

  111. -#expect {
    112. 

  112. -#	timeout { exit 1 }
    113. 

  113. -#	"@* PRIVMSG nick :test"
    114. 

  114. -#	"401"
    115. 

  115. -#}
    116. 

  116. +send "privmsg ~user\%127.0.0.1 :test\r"
    117. 

  117. +expect {
    118. 

  118. +	timeout { exit 1 }
    119. 

  119. +	"@* PRIVMSG nick :test"
    120. 

  120. +}
    121. 

  121. +
    122. 

  122. +send "privmsg Nick!~User@127.0.0.1 :test\r"
    123. 

  123. +expect {
    124. 

  124. +	timeout { exit 1 }
    125. 

  125. +	"@* PRIVMSG nick :test"
    126. 

  126. +}
    127. 

  127.  
    128. 

  128.  send "away :away\r"
    129. 

  129.  expect {
    130. 

  130. --- a/src/testsuite/misc-test.e
    131. 

  131. +++ b/src/testsuite/misc-test.e
    132. 

  132. @@ -1,7 +1,7 @@
    133. 

  133.  # ngIRCd test suite
    134. 

  134.  # Misc test
    135. 

  135.  
    136. 

  136. -spawn telnet localhost 6789
    137. 

  137. +spawn telnet 127.0.0.1 6789
    138. 

  138.  expect {
    139. 

  139.  	timeout { exit 1 }
    140. 

  140.  	"Connected"
    141. 

  141. @@ -130,7 +130,7 @@ expect {
    142. 

  142.  send "userhost nick\r"
    143. 

  143.  expect {
    144. 

  144.  	timeout { exit 1 }
    145. 

  145. -	-re ":ngircd.test.server 302 nick :?nick=+.*@(localhos.*|127.0.0.1)"
    146. 

  146. +	-re ":ngircd.test.server 302 nick :?nick=+.*@127.0.0.1"
    147. 

  147.  }
    148. 

  148.  
    149. 

  149.  send "userhost doesnotexist\r"
    150. 

  150. @@ -142,7 +142,7 @@ expect {
    151. 

  151.  send "userhost nick doesnotexist nick doesnotexist\r"
    152. 

  152.  expect {
    153. 

  153.  	timeout { exit 1 }
    154. 

  154. -	-re ":ngircd.test.server 302 nick :nick=+.*@(localhos.*|127.0.0.1) nick=+.*@(localhos.*|127.0.0.1)"
    155. 

  155. +	-re ":ngircd.test.server 302 nick :nick=+.*@127.0.0.1 nick=+.*@127.0.0.1"
    156. 

  156.  }
    157. 

  157.  
    158. 

  158.  send "away :testing\r"
    159. 

  159. @@ -154,7 +154,7 @@ expect {
    160. 

  160.  send "userhost nick nick nick nick nick nick\r"
    161. 

  161.  expect {
    162. 

  162.  	timeout { exit 1 }
    163. 

  163. -	-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"
    164. 

  164. +	-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"
    165. 

  165.  }
    166. 

  166.  
    167. 

  167.  send "quit\r"
    168. 

  168. --- a/src/testsuite/mode-test.e
    169. 

  169. +++ b/src/testsuite/mode-test.e
    170. 

  170. @@ -1,7 +1,7 @@
    171. 

  171.  # ngIRCd test suite
    172. 

  172.  # MODE test
    173. 

  173.  
    174. 

  174. -spawn telnet localhost 6789
    175. 

  175. +spawn telnet 127.0.0.1 6789
    176. 

  176.  expect {
    177. 

  177.  	timeout { exit 1 }
    178. 

  178.  	"Connected"
    179. 

  179. --- a/src/testsuite/ngircd-test1.conf
    180. 

  180. +++ b/src/testsuite/ngircd-test1.conf
    181. 

  181. @@ -17,6 +17,7 @@
    182. 

  182.  	OperCanUseMode = yes
    183. 

  183.  	Ident = no
    184. 

  184.  	IncludeDir = /var/empty
    185. 

  185. +	DNS = no
    186. 

  186.  	PAM = no
    187. 

  187.  
    188. 

  188.  [Operator]
    189. 

  189. --- a/src/testsuite/ngircd-test2.conf
    190. 

  190. +++ b/src/testsuite/ngircd-test2.conf
    191. 

  191. @@ -17,6 +17,7 @@
    192. 

  192.  	OperCanUseMode = yes
    193. 

  193.  	Ident = no
    194. 

  194.  	IncludeDir = /var/empty
    195. 

  195. +	DNS = no
    196. 

  196.  	PAM = no
    197. 

  197.  
    198. 

  198.  [Operator]
    199. 

  199. --- a/src/testsuite/opless-channel-test.e
    200. 

  200. +++ b/src/testsuite/opless-channel-test.e
    201. 

  201. @@ -1,7 +1,7 @@
    202. 

  202.  # ngIRCd test suite
    203. 

  203.  # Op-less channel test
    204. 

  204.  
    205. 

  205. -spawn telnet localhost 6789
    206. 

  206. +spawn telnet 127.0.0.1 6789
    207. 

  207.  expect {
    208. 

  208.         timeout { exit 1 }
    209. 

  209.         "Connected"
    210. 

  210. --- a/src/testsuite/server-link-test.e
    211. 

  211. +++ b/src/testsuite/server-link-test.e
    212. 

  212. @@ -1,7 +1,7 @@
    213. 

  213.  # ngIRCd test suite
    214. 

  214.  # server-server link test
    215. 

  215.  
    216. 

  216. -spawn telnet localhost 6790
    217. 

  217. +spawn telnet 127.0.0.1 6790
    218. 

  218.  expect {
    219. 

  219.  	timeout { exit 1 }
    220. 

  220.  	"Connected"
    221. 

  221. --- a/src/testsuite/stress-A.e
    222. 

  222. +++ b/src/testsuite/stress-A.e
    223. 

  223. @@ -3,7 +3,7 @@
    224. 

  224.  
    225. 

  225.  set timeout 30
    226. 

  226.  
    227. 

  227. -spawn telnet localhost 6789
    228. 

  228. +spawn telnet 127.0.0.1 6789
    229. 

  229.  expect {
    230. 

  230.  	timeout { exit 1 }
    231. 

  231.  	"Connected"
    232. 

  232. --- a/src/testsuite/who-test.e
    233. 

  233. +++ b/src/testsuite/who-test.e
    234. 

  234. @@ -1,7 +1,7 @@
    235. 

  235.  # ngIRCd test suite
    236. 

  236.  # WHO test
    237. 

  237.  
    238. 

  238. -spawn telnet localhost 6789
    239. 

  239. +spawn telnet 127.0.0.1 6789
    240. 

  240.  expect {
    241. 

  241.  	timeout { exit 1 }
    242. 

  242.  	"Connected"
    243. 

  243. @@ -62,7 +62,7 @@ expect {
    244. 

  244.  	":ngircd.test.server 352 nick #channel * * ngircd.test.server nick G@ :0 Real Name"
    245. 

  245.  }
    246. 

  246.  
    247. 

  247. -send "who localhos*\r"
    248. 

  248. +send "who 127.0.0.*\r"
    249. 

  249.  expect {
    250. 

  250.  	timeout { exit 1 }
    251. 

  251.  	":ngircd.test.server 352 nick \* * * ngircd.test.server nick G :0 Real Name"
    252. 

  252. @@ -120,7 +120,7 @@ expect {
    253. 

  253.  	"305 nick"
    254. 

  254.  }
    255. 

  255.  
    256. 

  256. -send "who ??cal*ho*\r"
    257. 

  257. +send "who ??7.*0*\r"
    258. 

  258.  expect {
    259. 

  259.  	timeout { exit 1 }
    260. 

  260.  	":ngircd.test.server 352 nick \* * * ngircd.test.server nick H* :0 Real Name"
    261. 

  261. --- a/src/testsuite/whois-test.e
    262. 

  262. +++ b/src/testsuite/whois-test.e
    263. 

  263. @@ -1,7 +1,7 @@
    264. 

  264.  # ngIRCd test suite
    265. 

  265.  # WHOIS test
    266. 

  266.  
    267. 

  267. -spawn telnet localhost 6789
    268. 

  268. +spawn telnet 127.0.0.1 6789
    269. 

  269.  expect {
    270. 

  270.  	timeout { exit 1 }
    271. 

  271.  	"Connected"
    272. 

  272. @@ -17,7 +17,7 @@ expect {
    273. 

  273.  send "whois nick\r"
    274. 

  274.  expect {
    275. 

  275.  	timeout { exit 1 }
    276. 

  276. -	"311 nick nick ~user localhost* \* :Real Name\r"
    277. 

  277. +	"311 nick nick ~user 127.0.0.1 \* :Real Name\r"
    278. 

  278.  }
    279. 

  279.  expect {
    280. 

  280.  	timeout { exit 1 }
    281. 

  281. @@ -27,25 +27,25 @@ expect {
    282. 

  282.  send "whois *\r"
    283. 

  283.  expect {
    284. 

  284.  	timeout { exit 1 }
    285. 

  285. -	"311 nick nick ~user localhost* \* :Real Name\r"
    286. 

  286. +	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
    287. 

  287.  }
    288. 

  288.  
    289. 

  289.  send "whois n*\r"
    290. 

  290.  expect {
    291. 

  291.  	timeout { exit 1 }
    292. 

  292. -	"311 nick nick ~user localhost* \* :Real Name\r"
    293. 

  293. +	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
    294. 

  294.  }
    295. 

  295.  
    296. 

  296.  send "whois ?ick\r"
    297. 

  297.  expect {
    298. 

  298.  	timeout { exit 1 }
    299. 

  299. -	"311 nick nick ~user localhost* \* :Real Name\r"
    300. 

  300. +	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
    301. 

  301.  }
    302. 

  302.  
    303. 

  303.  send "whois ????,n?*k\r"
    304. 

  304.  expect {
    305. 

  305.  	timeout { exit 1 }
    306. 

  306. -	"311 nick nick ~user localhost* \* :Real Name\r"
    307. 

  307. +	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
    308. 

  308.  }
    309. 

  309.  
    310. 

  310.  send "whois unknown\r"
    311. 

  311. @@ -61,7 +61,7 @@ expect {
    312. 

  312.  send "whois ngircd.test.server2 nick\r"
    313. 

  313.  expect {
    314. 

  314.  	timeout { exit 1 }
    315. 

  315. -	":ngircd.test.server2 311 nick nick ~user localhost* \* :Real Name\r"
    316. 

  316. +	":ngircd.test.server2 311 nick nick ~user 127.0.0.1* \* :Real Name\r"
    317. 

  317.  }
    318. 

  318.  
    319. 

  319.  send "whois nosuchserver unknown\r"
    320.