From 7b2a127841ebe3e73d1cc37b129ce586de1b2b68 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Tue, 28 Feb 2017 12:59:00 +0100 Subject: [PATCH] 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 --- test/integration/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/integration/main.cpp b/test/integration/main.cpp index 0d7d6696..73f0acf1 100644 --- 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");