MB-41719: Make test_producer_no_stream_end_on_client_close_stream ST

Change-Id: Iabfc0efdc576a354a017f89c2d90a1466d549b44
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/137424
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: BenHuddleston

engines/ep/tests/module_tests/dcp_single_threaded_test.cc

@@ -663,6 +663,39 @@ TEST_P(STDcpTest, test_producer_stream_end_on_client_close_stream) {
     mockConnMap.manageConnections();
 }
 
+/* Checks that the DCP producer does a synchronous stream close when the DCP
+   client does not expect "DCP_STREAM_END" msg. */
+TEST_P(STDcpTest, test_producer_no_stream_end_on_client_close_stream) {
+    setVBucketStateAndRunPersistTask(vbid, vbucket_state_active);
+
+    auto& connMap = engine->getDcpConnMap();
+    const void* cookie = create_mock_cookie(engine.get());
+
+    /* Create a new Dcp producer */
+    DcpProducer* producer = connMap.newProducer(cookie,
+                                                "test_producer",
+                                                /*flags*/ 0);
+
+    /* Open stream */
+    EXPECT_EQ(ENGINE_SUCCESS, doStreamRequest(*producer).status);
+
+    /* Close stream */
+    EXPECT_EQ(ENGINE_SUCCESS, producer->closeStream(0, vbid));
+
+    /* Don't expect a stream end message (or any other message as the stream is
+       closed) */
+    MockDcpMessageProducers producers(engine.get());
+    EXPECT_EQ(ENGINE_EWOULDBLOCK, producer->step(&producers));
+
+    /* Check that the stream is not found in the producer's stream map */
+    EXPECT_TRUE(producer->findStreams(vbid)->wlock().empty());
+
+    /* Disconnect the producer connection */
+    connMap.disconnect(cookie);
+    /* Cleanup the deadConnections */
+    connMap.manageConnections();
+}
+
 INSTANTIATE_TEST_SUITE_P(PersistentAndEphemeral,
                          STDcpTest,
                          STParameterizedBucketTest::allConfigValues());

engines/ep/tests/module_tests/dcp_test.cc

@@ -1162,37 +1162,7 @@ TEST_P(ConnectionTest, test_mb17042_duplicate_cookie_producer_connections) {
 }
 
 
-/* Checks that the DCP producer does a synchronous stream close when the DCP
-   client does not expect "DCP_STREAM_END" msg. */
-TEST_P(ConnectionTest, test_producer_no_stream_end_on_client_close_stream) {
-    MockDcpConnMap connMap(*engine);
-    connMap.initialize();
-    const void* cookie = create_mock_cookie(engine);
-
-    /* Create a new Dcp producer */
-    DcpProducer* producer = connMap.newProducer(cookie,
-                                                "test_producer",
-                                                /*flags*/ 0);
-
-    /* Open stream */
-    EXPECT_EQ(ENGINE_SUCCESS, doStreamRequest(*producer).status);
-
-    /* Close stream */
-    EXPECT_EQ(ENGINE_SUCCESS, producer->closeStream(0, vbid));
-
-    /* Don't expect a stream end message (or any other message as the stream is
-       closed) */
-    MockDcpMessageProducers producers(handle);
-    EXPECT_EQ(ENGINE_EWOULDBLOCK, producer->step(&producers));
 
-    /* Check that the stream is not found in the producer's stream map */
-    EXPECT_TRUE(producer->findStreams(vbid)->wlock().empty());
-
-    /* Disconnect the producer connection */
-    connMap.disconnect(cookie);
-    /* Cleanup the deadConnections */
-    connMap.manageConnections();
-}
 
 TEST_P(ConnectionTest, test_producer_unknown_ctrl_msg) {
     const void* cookie = create_mock_cookie(engine);