From 9d909ed681d65dc58391739da948a759ac85dc5b Mon Sep 17 00:00:00 2001
From: Amal Hussein <amal@bocoup.com>
Date: Mon, 19 Mar 2018 14:14:43 -0400
Subject: [PATCH] fixup from pr feedback

---
 test/built-ins/Atomics/wait/did-timeout.js          |  5 ++++-
 test/built-ins/Atomics/wait/negative-timeout.js     |  2 --
 .../wait/poisoned-object-for-timeout-throws.js      | 13 ++++++-------
 .../Atomics/wait/symbol-for-timeout-throws.js       |  8 +++-----
 test/built-ins/Atomics/wait/true-for-timeout.js     |  2 +-
 .../Atomics/wait/wait-index-value-not-equal.js      |  3 ++-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/test/built-ins/Atomics/wait/did-timeout.js b/test/built-ins/Atomics/wait/did-timeout.js
index 908d0382d4..1083d4c4c7 100644
--- a/test/built-ins/Atomics/wait/did-timeout.js
+++ b/test/built-ins/Atomics/wait/did-timeout.js
@@ -24,10 +24,13 @@ $262.agent.receiveBroadcast(function (sab, id) {
 var ia = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));
 
 $262.agent.broadcast(ia.buffer);
-
 assert.sameValue(getReport(), "timed-out");
 assert.sameValue((getReport() | 0) >= 500 - $ATOMICS_MAX_TIME_EPSILON, true);
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> fixup from pr feedback
 function getReport() {
   var r;
   while ((r = $262.agent.getReport()) == null)
diff --git a/test/built-ins/Atomics/wait/negative-timeout.js b/test/built-ins/Atomics/wait/negative-timeout.js
index 6b91448211..84ce5ce190 100644
--- a/test/built-ins/Atomics/wait/negative-timeout.js
+++ b/test/built-ins/Atomics/wait/negative-timeout.js
@@ -28,5 +28,3 @@ function getReport() {
     $262.agent.sleep(100);
   return r;
 }
-
-assert.sameValue(Atomics.wake(ia, 0), 0);
diff --git a/test/built-ins/Atomics/wait/poisoned-object-for-timeout-throws.js b/test/built-ins/Atomics/wait/poisoned-object-for-timeout-throws.js
index 2145a37be0..0ca369b12a 100644
--- a/test/built-ins/Atomics/wait/poisoned-object-for-timeout-throws.js
+++ b/test/built-ins/Atomics/wait/poisoned-object-for-timeout-throws.js
@@ -31,20 +31,21 @@ function getReport() {
 $262.agent.start(
   `
 $262.agent.receiveBroadcast(function (sab) {
-  
-  var int32Array = new Int32Array(sab);
-
+ 
+  var int32Array = new Int32Array(sab);  
   var poisoned = {
     valueOf: false,
     toString: false
   };
+  var err;
   
   try {
     Atomics.wait(int32Array, 0, 0, poisoned);
   } catch(e) {
-    $262.agent.report(e.name);
+    err = e.name;
   }
-
+  
+  $262.agent.report(err);
   $262.agent.leaving();
 })
 `);
@@ -54,8 +55,6 @@ var int32Array = new Int32Array(sab);
 
 $262.agent.broadcast(int32Array.buffer);
 
-$262.agent.sleep(150);
-
 assert.sameValue(getReport(), 'TypeError');
 
 assert.sameValue(Atomics.wake(int32Array, 0), 0);
diff --git a/test/built-ins/Atomics/wait/symbol-for-timeout-throws.js b/test/built-ins/Atomics/wait/symbol-for-timeout-throws.js
index 9a46c15fb2..dd003bf5e7 100644
--- a/test/built-ins/Atomics/wait/symbol-for-timeout-throws.js
+++ b/test/built-ins/Atomics/wait/symbol-for-timeout-throws.js
@@ -27,13 +27,15 @@ $262.agent.start(
 $262.agent.receiveBroadcast(function (sab) {  
 
   var int32Array = new Int32Array(sab);
+  var err;
   
   try {
     Atomics.wait(int32Array, 0, 0, Symbol('foo'));
   } catch(e) {
-   $262.agent.report(e.name);
+    err = e.name;
   }
   
+  $262.agent.report(err);
   $262.agent.leaving();
 })
 `);
@@ -43,8 +45,4 @@ var int32Array = new Int32Array(sab);
 
 $262.agent.broadcast(int32Array.buffer);
 
-$262.agent.sleep(150);
-
 assert.sameValue(getReport(), 'TypeError');
-
-assert.sameValue(Atomics.wake(int32Array, 0), 0);
diff --git a/test/built-ins/Atomics/wait/true-for-timeout.js b/test/built-ins/Atomics/wait/true-for-timeout.js
index 8fc9d331f3..fd4f4e62ce 100644
--- a/test/built-ins/Atomics/wait/true-for-timeout.js
+++ b/test/built-ins/Atomics/wait/true-for-timeout.js
@@ -38,7 +38,7 @@ var int32Array = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEME
 
 $262.agent.broadcast(int32Array.buffer);
 
-$262.agent.sleep(150);
+$262.agent.sleep(2);
 
 var r1 = getReport();
 var r2 = getReport();
diff --git a/test/built-ins/Atomics/wait/wait-index-value-not-equal.js b/test/built-ins/Atomics/wait/wait-index-value-not-equal.js
index 23484d7970..b40986abc9 100644
--- a/test/built-ins/Atomics/wait/wait-index-value-not-equal.js
+++ b/test/built-ins/Atomics/wait/wait-index-value-not-equal.js
@@ -17,8 +17,9 @@ features: [ Atomics, SharedArrayBuffer, TypedArray ]
 
 function getReport() {
   var r;
-  while ((r = $262.agent.getReport()) == null)
+  while ((r = $262.agent.getReport()) == null) {
     $262.agent.sleep(100);
+  }
   return r;
 }