From dd99d3e9503ca20337850bf17b606bdbf9bb8266 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sun, 29 Dec 2024 15:16:27 +0000
Subject: [PATCH] simplify test

---
 test/integration/tests/core.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/integration/tests/core.cpp b/test/integration/tests/core.cpp
index 470de11d..d0eec016 100644
--- a/test/integration/tests/core.cpp
+++ b/test/integration/tests/core.cpp
@@ -819,13 +819,9 @@ TEST_F(ZNCTest, ChgHostOnlyNicksAlreadyOnChannels) {
     client.ReadUntil("another");
 
     ircd.Write(":another!ident@host CHGHOST i2 h2");
-    client.ReadUntil(":another!i2@h2 JOIN #chan1");
-
-    // Can't combine into previous channels could arrive in random order, which
-    // messes with ReadUntil assertions.
-    ircd.Write(":another!i2@h2 CHGHOST i3 h3");
     ASSERT_THAT(client.ReadRemainder().toStdString(),
-                Not(HasSubstr("#chan2")));
+                AllOf(HasSubstr("JOIN #chan1"),
+                    Not(HasSubstr("#chan2"))));
 }
 
 }  // namespace