From 50b93219f8c8eb11f18e9017eb880ea8fd266478 Mon Sep 17 00:00:00 2001
From: Derrick Rice <derrick.rice@gmail.com>
Date: Tue, 6 Mar 2012 05:02:00 -0500
Subject: [PATCH] Bug 732363 - Avoid oranges in test_net_addr.js by retaining
 references to the transport and output stream. r=jdm

---
 netwerk/test/unit/test_net_addr.js | 31 +++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/netwerk/test/unit/test_net_addr.js b/netwerk/test/unit/test_net_addr.js
index d4bbffe60fa3..eb7555c484d1 100644
--- a/netwerk/test/unit/test_net_addr.js
+++ b/netwerk/test/unit/test_net_addr.js
@@ -121,22 +121,33 @@ var serv;
  */
 var connectTimeout = 5*1000;
 
+/**
+ * A place for individual tests to place Objects of importance for access
+ * throughout asynchronous testing.  Particularly important for any output or
+ * input streams opened, as cleanup of those objects (by the garbage collector)
+ * causes the stream to close and may have other side effects.
+ */
+var testDataStore = null;
+
 /**
  * IPv4 test.
  */
 function testIpv4() {
-  var transport;
+  testDataStore = {
+    transport : null ,
+    ouput : null
+  }
 
   serv.acceptCallback = function() {
     // disable the timeoutCallback
     serv.timeoutCallback = function(){};
 
-    var selfAddr = transport.getScriptableSelfAddr();
-    var peerAddr = transport.getScriptablePeerAddr();
+    var selfAddr = testDataStore.transport.getScriptableSelfAddr();
+    var peerAddr = testDataStore.transport.getScriptablePeerAddr();
 
     // check peerAddr against expected values
     do_check_eq(peerAddr.family, Ci.nsINetAddr.FAMILY_INET);
-    do_check_eq(peerAddr.port, transport.port);
+    do_check_eq(peerAddr.port, testDataStore.transport.port);
     do_check_eq(peerAddr.port, serv.port);
     do_check_eq(peerAddr.address, "127.0.0.1");
 
@@ -148,6 +159,7 @@ function testIpv4() {
     checkAddrEqual(selfAddr, serv.peerAddr);
     checkAddrEqual(peerAddr, serv.selfAddr);
 
+    testDataStore = null;
     do_execute_soon(run_next_test);
   };
 
@@ -158,11 +170,16 @@ function testIpv4() {
   };
   do_timeout(connectTimeout, function(){ serv.timeoutCallback('testIpv4'); });*/
 
-  transport = sts.createTransport(null, 0, '127.0.0.1', serv.port, null);
-  transport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING,0,0);
+  testDataStore.transport = sts.createTransport(null, 0, '127.0.0.1', serv.port, null);
+  /*
+   * Need to hold |output| so that the output stream doesn't close itself and
+   * the associated connection.
+   */
+  testDataStore.output = testDataStore.transport.openOutputStream(Ci.nsITransport.OPEN_BLOCKING,0,0);
+
   /* NEXT:
    * openOutputStream -> onSocketAccepted -> acceptedCallback -> run_next_test
-   * OR
+   * OR (if the above timeout is uncommented)
    * <connectTimeout lapses> -> timeoutCallback -> do_throw
    */
 }