From 6e585191e028760b9aa89537c7a383b3857891da Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Fri, 14 Aug 2009 09:57:36 +0200 Subject: Replies are different for platforms as we target different server machines. On Symbian we read replies from external file, for others we put data into network-settings.h --- tests/auto/network-settings.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 1843ffd..20d342d 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -158,15 +158,11 @@ public: } return imapExpectedReply.data(); } -#endif - /*QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ); - expected = expected.append(QtNetworkSettings::serverLocalName().toAscii()); - expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");*/ - - QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4REV1] " ); - expected = expected.append(QtNetworkSettings::serverLocalName().toAscii()); +#else + QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ); + expected = expected.append(QtNetworkSettings::serverName().toAscii()); expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); - +#endif return expected; } -- cgit v0.12