diff options
author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-08-14 07:57:36 (GMT) |
---|---|---|
committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-08-14 08:03:23 (GMT) |
commit | 6e585191e028760b9aa89537c7a383b3857891da (patch) | |
tree | 3c5cf2387a0a22b4f9d30a3250eb32b33a5ab1c6 /tests/auto/network-settings.h | |
parent | a0ed07b8cd65fd5f18283a745792bf60814bf9dc (diff) | |
download | Qt-6e585191e028760b9aa89537c7a383b3857891da.zip Qt-6e585191e028760b9aa89537c7a383b3857891da.tar.gz Qt-6e585191e028760b9aa89537c7a383b3857891da.tar.bz2 |
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
Diffstat (limited to 'tests/auto/network-settings.h')
-rw-r--r-- | tests/auto/network-settings.h | 12 |
1 files 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; } |