From f4f30c29251dcb39f72d7120d4641a25013b7d2e Mon Sep 17 00:00:00 2001
From: Antoine Vandecreme <ant.vand@gmail.com>
Date: Mon, 9 Nov 2015 19:02:31 -0500
Subject: [PATCH] Fix race condition in navigator tests.

---
 test/modules/navigator.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/modules/navigator.js b/test/modules/navigator.js
index c6381a20..e300b4a0 100644
--- a/test/modules/navigator.js
+++ b/test/modules/navigator.js
@@ -801,7 +801,6 @@
     });
 
     asyncTest('Item positions including collection mode', function() {
-        var navAddCount = 0;
 
         viewer = OpenSeadragon({
             id:            'example',
@@ -815,16 +814,16 @@
         var openHandler = function() {
             viewer.removeHandler('open', openHandler);
             viewer.navigator.world.addHandler('add-item', navOpenHandler);
+            // The navigator may already have added the items.
+            navOpenHandler();
         };
 
         var navOpenHandler = function(event) {
-            navAddCount++;
-            if (navAddCount === 2) {
+            if (viewer.navigator.world.getItemCount() === 2) {
                 viewer.navigator.world.removeHandler('add-item', navOpenHandler);
 
                 setTimeout(function() {
                     // Test initial formation
-                    equal(viewer.navigator.world.getItemCount(), 2, 'navigator has both items');
                     for (var i = 0; i < 2; i++) {
                         propEqual(viewer.navigator.world.getItemAt(i).getBounds(),
                             viewer.world.getItemAt(i).getBounds(), 'bounds are the same');