Skip to content

Commit b5f0d15

Browse files
committed
Merge branch 'main' into manual-puback
2 parents ce823d9 + fbb9615 commit b5f0d15

File tree

3 files changed

+1090
-1817
lines changed

3 files changed

+1090
-1817
lines changed

tests/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,19 +224,18 @@ if(NOT BYO_CRYPTO)
224224
add_net_test_case(Mqtt5DirectConnectionWithMetricsCollection)
225225
add_net_test_case(Mqtt5DirectConnectionWithTLS)
226226
add_net_test_case(Mqtt5DirectConnectionWithMutualTLS)
227+
add_net_test_case(Mqtt5DirectConnectionWithMutualTLSAndALPN)
227228
add_net_test_case(Mqtt5DirectConnectionWithHttpProxy)
228229
add_net_test_case(Mqtt5DirectConnectionFull)
229230
add_net_test_case(Mqtt5WSConnectionMinimal)
230231
add_net_test_case(Mqtt5WSConnectionWithBasicAuth)
231232
add_net_test_case(Mqtt5WSConnectionWithTLS)
232233
add_net_test_case(Mqtt5WSConnectionWithMutualTLS)
233-
# Skip the websocket connection with http proxy
234-
# add_net_test_case(Mqtt5WSConnectionWithHttpProxy)
234+
add_net_test_case(Mqtt5WSConnectionWithHttpProxy)
235235
add_net_test_case(Mqtt5WSConnectionFull)
236236
add_net_test_case(Mqtt5InvalidHostname)
237237
add_net_test_case(Mqtt5InvalidPort)
238238
add_net_test_case(Mqtt5WSInvalidPort)
239-
add_net_test_case(Mqtt5SocketTimeout)
240239
add_net_test_case(Mqtt5IncorrectBasicAuth)
241240
add_net_test_case(Mqtt5IncorrectWSConnect)
242241
add_net_test_case(Mqtt5DoubleClientIDFailure)
@@ -262,7 +261,6 @@ if(NOT BYO_CRYPTO)
262261
add_net_test_case(Mqtt5InterruptUnsub)
263262
add_net_test_case(Mqtt5InterruptPublishQoS1)
264263
add_net_test_case(Mqtt5OperationStatisticsSimple)
265-
add_net_test_case(Mqtt5SharedSubscriptionTest)
266264

267265
# Mqtt5-to-3 Adapter
268266
add_test_case(Mqtt5to3AdapterNewConnectionMin)

0 commit comments

Comments
 (0)