qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix channel options test when no SSL is configured 

The channel options test should not check the SSL configuration when
SSL has not been configured

Fixes: QTBUG-131134
Pick-to: 6.8
Change-Id: I6356d0e7b9330a6b5d6830da93d4bb0958f6dcf7
Reviewed-by: Jaime Resano <Jaime.RESANO-AISA@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Jaime Resano 2024-11-12 17:07:26 +01:00
parent 868615267b
commit c0599b3840
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/grpc/qgrpcchanneloptions/tst_qgrpcchanneloptions.cpp
View File

@ -21,7 +21,9 @@ private Q_SLOTS:
void propertyMetadata() const; void propertyMetadata() const;
void propertyDeadline() const; void propertyDeadline() const;
void propertySerializationFormat() const; void propertySerializationFormat() const;
#if QT_CONFIG(ssl)
void propertySslConfiguration() const; void propertySslConfiguration() const;
#endif
void streamsToDebug() const; void streamsToDebug() const;
}; };
@ -30,7 +32,10 @@ void QGrpcChannelOptionsTest::hasSpecialMemberFunctions() const
QGrpcChannelOptions o1; QGrpcChannelOptions o1;
QVERIFY(!o1.deadlineTimeout()); QVERIFY(!o1.deadlineTimeout());
QVERIFY(o1.metadata().empty()); QVERIFY(o1.metadata().empty());
#if QT_CONFIG(ssl)
QVERIFY(!o1.sslConfiguration()); QVERIFY(!o1.sslConfiguration());
#endif
o1.setDeadlineTimeout(100ms); o1.setDeadlineTimeout(100ms);
@ -126,6 +131,7 @@ void QGrpcChannelOptionsTest::propertySerializationFormat() const
QCOMPARE_NE(o1.serializationFormat().suffix(), o1Detach.serializationFormat().suffix()); QCOMPARE_NE(o1.serializationFormat().suffix(), o1Detach.serializationFormat().suffix());
} }
#if QT_CONFIG(ssl)
void QGrpcChannelOptionsTest::propertySslConfiguration() const void QGrpcChannelOptionsTest::propertySslConfiguration() const
{ {
QSslConfiguration sslConfig; QSslConfiguration sslConfig;
@ -139,6 +145,7 @@ void QGrpcChannelOptionsTest::propertySslConfiguration() const
QCOMPARE_EQ(o1.sslConfiguration()->sessionTicket(), sslConfig.sessionTicket()); QCOMPARE_EQ(o1.sslConfiguration()->sessionTicket(), sslConfig.sessionTicket());
QCOMPARE_NE(o1.sslConfiguration(), o1Detach.sslConfiguration()); QCOMPARE_NE(o1.sslConfiguration(), o1Detach.sslConfiguration());
} }
#endif
void QGrpcChannelOptionsTest::streamsToDebug() const void QGrpcChannelOptionsTest::streamsToDebug() const
{ {