Fix tests relying on table output

The output style of tables was recently changed. This broke the
ControlpanelModule integration test. Adapt some of the patterns used so
that they work again.

Signed-off-by: Uli Schlachter <redacted>

diff --git a/test/integration/main.cpp b/test/integration/main.cpp
index 0d7d6696ce93592e10e92cd71b3a75c7402e9847..73f0acf139607956f8f2134608b7b8a31c837468 100644 (file)
--- a/test/integration/main.cpp
+++ b/test/integration/main.cpp
@@ -779,7 +779,7 @@ TEST_F(ZNCTest, ControlpanelModule) {
     Z;
 
     client.Write(request + "ListCTCPs");
-    client.ReadUntil(response + "Request: VERSION");
+    client.ReadUntil(response + "| VERSION | Test  |");
     Z;
 
     client.Write(request + "ListMods");
@@ -791,11 +791,11 @@ TEST_F(ZNCTest, ControlpanelModule) {
     Z;
 
     client.Write(request + "ListNetworks");
-    client.ReadUntil(response + "Network: test");
+    client.ReadUntil(response + "| test ");
     Z;
 
     client.Write(request + "ListUsers");
-    client.ReadUntil(response + "Username: user");
+    client.ReadUntil(response + "| user ");
     Z;
 
     client.Write(request + "LoadModule");
@@ -1366,7 +1366,7 @@ TEST_F(ZNCTest, ControlpanelModule) {
     Z;
 
     client.Write(request + "ListCTCPs KindOne");
-    client.ReadUntil(response + "Request: VERSION");
+    client.ReadUntil(response + "| VERSION | Test");
     Z;
 
     client.Write(request + "ListMods KindOne");
@@ -1384,7 +1384,7 @@ TEST_F(ZNCTest, ControlpanelModule) {
     Z;
 
     client.Write(request + "ListMods KindOne");
-    client.ReadUntil(response + "Name: perform");
+    client.ReadUntil(response + "| perform |");
     Z;
 
     client.Write(request + "ListNetMods KindOne");
@@ -1392,11 +1392,11 @@ TEST_F(ZNCTest, ControlpanelModule) {
     Z;
 
     client.Write(request + "ListNetworks KindOne");
-    client.ReadUntil(response + "Network: freenode");
+    client.ReadUntil(response + "| freenode | No ");
     Z;
 
     client.Write(request + "ListUsers");
-    client.ReadUntil(response + "Username: user");
+    client.ReadUntil(response + "| user ");
     Z;
 
     client.Write(request + "LoadModule");