From 04da86884c924978dddfcde0f79d1657c629d26c Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Wed, 18 May 2016 14:57:29 -0700
Subject: [PATCH] Fix flakey attached/detached timing test.

---
 test/unit/attach-detach-timing.html | 45 +++++++++++++++++++----------
 1 file changed, 29 insertions(+), 16 deletions(-)
diff --git a/test/unit/attach-detach-timing.html b/test/unit/attach-detach-timing.html
index 070259f7c1..77dd1ad4e9 100644
--- a/test/unit/attach-detach-timing.html
+++ b/test/unit/attach-detach-timing.html
@@ -52,22 +52,35 @@
   <body>
     <attach-detach id="ad"></attach-detach>
     <script>
-    var ad = document.getElementById('ad');
-    ad.remove();
-    var el = document.createElement('attach-detach');
-    document.body.appendChild(el);
-    el.remove();
-    test('attach() and detach() are correct for upgraded elements', function() {
-      checkOrder(ad);
-    });
-    test('attach() and detach() are correct for imperative elements', function() {
-      checkOrder(el);
-    });
-    test('attach() and detach() are correct for elements made after load', function() {
-      var e = document.createElement('attach-detach');
-      document.body.appendChild(e);
-      e.remove();
-      checkOrder(e);
+    suite('attached-detached timing', function() {
+
+      var ad = document.getElementById('ad');
+      ad.remove();
+      var el = document.createElement('attach-detach');
+      document.body.appendChild(el);
+      el.remove();
+      
+      test('attach() and detach() are correct for upgraded elements', function(done) {
+        Polymer.RenderStatus.whenReady(function() {
+          checkOrder(ad);
+          done();
+        });
+      });
+      test('attach() and detach() are correct for imperative elements', function(done) {
+        Polymer.RenderStatus.whenReady(function() {
+          checkOrder(el);
+          done();
+        });
+      });
+      test('attach() and detach() are correct for elements made after load', function(done) {
+        Polymer.RenderStatus.whenReady(function() {
+          var e = document.createElement('attach-detach');
+          document.body.appendChild(e);
+          e.remove();
+          checkOrder(e);
+          done();
+        });
+      });
     });
     </script>
   </body>
