2 files changed, 16 insertions, 9 deletions

diff --git a/tools/slang-unit-test/unit-test-process.cpp b/tools/slang-unit-test/unit-test-process.cpp
index 8a55b0b29..548ef168f 100644
--- a/tools/slang-unit-test/unit-test-process.cpp
+++ b/tools/slang-unit-test/unit-test-process.cpp
@@ -48,10 +48,17 @@ static SlangResult _httpReflectTest(UnitTestContext* context)
         SLANG_RETURN_ON_FAIL(connection->write(buf.getBuffer(), size_t(size)));
 
         // Wait for the response
-        SLANG_RETURN_ON_FAIL(connection->waitForContent());
+        SLANG_RETURN_ON_FAIL(connection->waitForResult());
 
-        auto readContent = connection->getContent();
+        // If we don't have content then something has gone wrong
+        if (!connection->hasContent())
+        {
+            finalRes = SLANG_FAIL;
+            break;
+        }
 
+        // Check the content is the same
+        auto readContent = connection->getContent();
         if (readContent != buf.getArrayView())
         {
             finalRes = SLANG_FAIL;
diff --git a/tools/test-proxy/test-proxy-main.cpp b/tools/test-proxy/test-proxy-main.cpp
index 9a3523d71..bcb8f2a92 100644
--- a/tools/test-proxy/test-proxy-main.cpp
+++ b/tools/test-proxy/test-proxy-main.cpp
@@ -223,17 +223,17 @@ static SlangResult _httpReflect(int argc, const char* const* argv)
 
     RefPtr<BufferedReadStream> readStream(new BufferedReadStream(stdinStream));
 
-    RefPtr<HTTPPacketConnection> packetConnection = new HTTPPacketConnection(readStream, stdoutStream);
+    RefPtr<HTTPPacketConnection> connection = new HTTPPacketConnection(readStream, stdoutStream);
 
-    while (packetConnection->isActive())
+    while (connection->isActive())
     {
         // Block waiting for content (or error/closed)
-        SLANG_RETURN_ON_FAIL(packetConnection->waitForContent());
+        SLANG_RETURN_ON_FAIL(connection->waitForResult());
 
         // If we have content do something with it
-        if (packetConnection->hasContent())
+        if (connection->hasContent())
         {
-            auto content = packetConnection->getContent();
+            auto content = connection->getContent();
 
             // If it just holds 'end' then we are done
             const UnownedStringSlice slice((const char*)content.begin(), content.getCount());
@@ -244,10 +244,10 @@ static SlangResult _httpReflect(int argc, const char* const* argv)
             }
 
             // Else reflect it back
-            SLANG_RETURN_ON_FAIL(packetConnection->write(content.begin(), content.getCount()));
+            SLANG_RETURN_ON_FAIL(connection->write(content.begin(), content.getCount()));
 
             // Consume that content/packet
-            packetConnection->consumeContent();
+            connection->consumeContent();
         }
     }