4 files changed, 66 insertions, 3 deletions
diff --git a/ext/node/polyfills/internal_binding/tcp_wrap.ts b/ext/node/polyfills/internal_binding/tcp_wrap.ts
index 973a1d1c0..1321cc627 100644
--- a/ext/node/polyfills/internal_binding/tcp_wrap.ts
+++ b/ext/node/polyfills/internal_binding/tcp_wrap.ts
@@ -299,8 +299,8 @@ export class TCP extends ConnectionWrap {
    * @param noDelay
    * @return An error status code.
    */
-  setNoDelay(_noDelay: boolean): number {
-    // TODO(bnoordhuis) https://github.com/denoland/deno/pull/13103
+  setNoDelay(noDelay: boolean): number {
+    this[kStreamBaseField].setNoDelay(noDelay);
     return 0;
   }
 
diff --git a/tests/node_compat/config.jsonc b/tests/node_compat/config.jsonc
index bc9bf476b..75f463342 100644
--- a/tests/node_compat/config.jsonc
+++ b/tests/node_compat/config.jsonc
@@ -439,6 +439,7 @@
       "test-net-server-unref.js",
       "test-net-socket-destroy-twice.js",
       "test-net-socket-no-halfopen-enforcer.js",
+      "test-net-socket-setnodelay.js",
       "test-net-timeout-no-handle.js",
       "test-net-write-arguments.js",
       "test-next-tick-doesnt-hang.js",
diff --git a/tests/node_compat/runner/TODO.md b/tests/node_compat/runner/TODO.md
index 99258f5a5..11b5d2805 100644
--- a/tests/node_compat/runner/TODO.md
+++ b/tests/node_compat/runner/TODO.md
@@ -1851,7 +1851,6 @@ NOTE: This file should not be manually edited. Please edit `tests/node_compat/co
 - [parallel/test-net-socket-ready-without-cb.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-ready-without-cb.js)
 - [parallel/test-net-socket-reset-send.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-reset-send.js)
 - [parallel/test-net-socket-reset-twice.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-reset-twice.js)
-- [parallel/test-net-socket-setnodelay.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-setnodelay.js)
 - [parallel/test-net-socket-timeout-unref.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-timeout-unref.js)
 - [parallel/test-net-socket-timeout.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-timeout.js)
 - [parallel/test-net-socket-write-after-close.js](https://github.com/nodejs/node/tree/v18.12.1/test/parallel/test-net-socket-write-after-close.js)
diff --git a/tests/node_compat/test/parallel/test-net-socket-setnodelay.js b/tests/node_compat/test/parallel/test-net-socket-setnodelay.js
new file mode 100644
index 000000000..3d11b8452
--- /dev/null
+++ b/tests/node_compat/test/parallel/test-net-socket-setnodelay.js
@@ -0,0 +1,63 @@
+// deno-fmt-ignore-file
+// deno-lint-ignore-file
+
+// Copyright Joyent and Node contributors. All rights reserved. MIT license.
+// Taken from Node 18.12.1
+// This file is automatically generated by `tests/node_compat/runner/setup.ts`. Do not modify this file manually.
+
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
+
+const truthyValues = [true, 1, 'true', {}, []];
+const falseyValues = [false, 0, ''];
+const genSetNoDelay = (desiredArg) => (enable) => {
+  assert.strictEqual(enable, desiredArg);
+};
+
+// setNoDelay should default to true
+let socket = new net.Socket({
+  handle: {
+    setNoDelay: common.mustCall(genSetNoDelay(true)),
+    readStart() {}
+  }
+});
+socket.setNoDelay();
+
+socket = new net.Socket({
+  handle: {
+    setNoDelay: common.mustCall(genSetNoDelay(true), 1),
+    readStart() {}
+  }
+});
+truthyValues.forEach((testVal) => socket.setNoDelay(testVal));
+
+socket = new net.Socket({
+  handle: {
+    setNoDelay: common.mustNotCall(),
+    readStart() {}
+  }
+});
+falseyValues.forEach((testVal) => socket.setNoDelay(testVal));
+
+socket = new net.Socket({
+  handle: {
+    setNoDelay: common.mustCall(3),
+    readStart() {}
+  }
+});
+truthyValues.concat(falseyValues).concat(truthyValues)
+  .forEach((testVal) => socket.setNoDelay(testVal));
+
+// If a handler doesn't have a setNoDelay function it shouldn't be called.
+// In the case below, if it is called an exception will be thrown
+socket = new net.Socket({
+  handle: {
+    setNoDelay: null,
+    readStart() {}
+  }
+});
+const returned = socket.setNoDelay(true);
+assert.ok(returned instanceof net.Socket);