From 7a4cc47d9cd087cd36a1318e7c02367d2fdc515a Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@progval.net>
Date: Sat, 19 Dec 2015 23:44:51 +0100
Subject: [PATCH] Enable IRCv3 for InspIRCd.

---
 irctest/controllers/inspircd.py  |  3 +++
 irctest/server_tests/test_cap.py | 16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/irctest/controllers/inspircd.py b/irctest/controllers/inspircd.py
index 5ffaaca..151f620 100644
--- a/irctest/controllers/inspircd.py
+++ b/irctest/controllers/inspircd.py
@@ -10,6 +10,9 @@ from irctest.basecontrollers import BaseServerController, DirectoryBasedControll
 TEMPLATE_CONFIG = """
 <bind address="{hostname}" port="{port}" type="clients">
 <module name="cap">
+<module name="ircv3">
+<module name="ircv3_capnotify">
+<connect allow="*" resolvehostnames="no"> # Faster
 """
 
 class InspircdController(BaseServerController, DirectoryBasedController):
diff --git a/irctest/server_tests/test_cap.py b/irctest/server_tests/test_cap.py
index feb8445..4f53b36 100644
--- a/irctest/server_tests/test_cap.py
+++ b/irctest/server_tests/test_cap.py
@@ -2,11 +2,15 @@ from irctest import cases
 from irctest.irc_utils.message_parser import Message
 
 class CapTestCase(cases.BaseServerTestCase):
-    def testNoCap(self):
+    def testNoReq(self):
         self.addClient(1)
         self.sendLine(1, 'CAP LS 302')
-        while True: # Ignore boring connection messages
-            m = self.getMessage(1)
-            if m.command != 'NOTICE':
-                break
-        print(m)
+        m = self.getMessage(1, filter_pred=lambda m:m.command != 'NOTICE')
+        self.assertEqual(m.command, 'CAP')
+        self.assertEqual(len(m.params), 3, m)
+        self.assertEqual(m.params[0:2], ['*', 'LS'], m)
+        self.sendLine(1, 'USER foo foo foo :foo')
+        self.sendLine(1, 'NICK foo')
+        self.sendLine(1, 'CAP END')
+        m = self.getMessage(1, filter_pred=lambda m:m.command != 'NOTICE')
+        self.assertEqual(m.command, '001')