Teach the network simulator to wait for Promises.

Tools/GardeningServer/scripts/test/results-tests.html

Index: Tools/GardeningServer/scripts/test/results-tests.html
diff --git a/Tools/GardeningServer/scripts/test/results-tests.html b/Tools/GardeningServer/scripts/test/results-tests.html
index be86bde64d4f0de85c3fc7982837a9b74e6c79ff..31e34e22eaec740c179c84cd3bcb19616a6b48e7 100644
--- a/Tools/GardeningServer/scripts/test/results-tests.html
+++ b/Tools/GardeningServer/scripts/test/results-tests.html
@@ -77,60 +77,64 @@ describe('results script', function() {
         return Promise.reject();
     };
     simulator.runTest(function() {
-      results.fetchResultsURLs({
-        'builderName': 'Mock Builder',
-        'testName': 'userscripts/another-test.html',
-        'failureTypeList': ['IMAGE', 'CRASH'],
-      }).then(function(resultURLs) {
-        assert.deepEqual(resultURLs, [
-          MockResultsBaseURL + '/userscripts/another-test-crash-log.txt'
-        ]);
-      });
-      results.fetchResultsURLs({
-        'builderName': 'Mock Builder',
-        'testName': 'userscripts/another-test.html',
-        'failureTypeList': ['TIMEOUT'],
-      }).then(function(resultURLs) {
-        assert.deepEqual(resultURLs, []);
-      });
-      results.fetchResultsURLs({
-        'builderName': 'Mock Builder',
-        'testName': 'userscripts/taco.html',
-        'failureTypeList': ['IMAGE', 'IMAGE+TEXT'],
-      }).then(function(resultURLs) {
-        assert.deepEqual(resultURLs, [
+      return Promise.resolve().then(function() {
+        return results.fetchResultsURLs({

[Jeffrey Yasskin, 2014/09/03 22:11:50]

The only changes here are the extra "}).then(function() {" lines, the addition
of a 'return' on the 'results.fetchResultsURLs(' lines, and the removal of
'done()'. Everything else is indentation.

+          'builderName': 'Mock Builder',
+          'testName': 'userscripts/another-test.html',
+          'failureTypeList': ['IMAGE', 'CRASH'],
+        }).then(function(resultURLs) {
+          assert.deepEqual(resultURLs, [
+            MockResultsBaseURL + '/userscripts/another-test-crash-log.txt'
+          ]);
+        });
+      }).then(function() {
+        return results.fetchResultsURLs({
+          'builderName': 'Mock Builder',
+          'testName': 'userscripts/another-test.html',
+          'failureTypeList': ['TIMEOUT'],
+        }).then(function(resultURLs) {
+          assert.deepEqual(resultURLs, []);
+        });
+      }).then(function() {
+        return results.fetchResultsURLs({
+          'builderName': 'Mock Builder',
+          'testName': 'userscripts/taco.html',
+          'failureTypeList': ['IMAGE', 'IMAGE+TEXT'],
+        }).then(function(resultURLs) {
+          assert.deepEqual(resultURLs, [
+            MockResultsBaseURL + '/userscripts/taco-expected.png',
+            MockResultsBaseURL + '/userscripts/taco-actual.png',
+            MockResultsBaseURL + '/userscripts/taco-diff.png',
+            MockResultsBaseURL + '/userscripts/taco-expected.txt',
+            MockResultsBaseURL + '/userscripts/taco-actual.txt',
+            MockResultsBaseURL + '/userscripts/taco-diff.txt',
+          ]);
+        });
+      }).then(function() {
+        return results.fetchResultsURLs({
+          'builderName': 'Mock Builder',
+          'testName': 'userscripts/another-test.html',
+          'failureTypeList': ['LEAK'],
+        }).then(function(resultURLs) {
+          assert.deepEqual(resultURLs, [
+            MockResultsBaseURL + '/userscripts/another-test-leak-log.txt'
+          ]);
+        });
+      }).then(function() {
+        assert.deepEqual(probedURLs, [
+          MockResultsBaseURL + '/userscripts/another-test-expected.png',
+          MockResultsBaseURL + '/userscripts/another-test-actual.png',
+          MockResultsBaseURL + '/userscripts/another-test-diff.png',
+          MockResultsBaseURL + '/userscripts/another-test-crash-log.txt',
           MockResultsBaseURL + '/userscripts/taco-expected.png',
           MockResultsBaseURL + '/userscripts/taco-actual.png',
           MockResultsBaseURL + '/userscripts/taco-diff.png',
-          MockResultsBaseURL + '/userscripts/taco-expected.txt',
           MockResultsBaseURL + '/userscripts/taco-actual.txt',
+          MockResultsBaseURL + '/userscripts/taco-expected.txt',
           MockResultsBaseURL + '/userscripts/taco-diff.txt',
+          MockResultsBaseURL + '/userscripts/another-test-leak-log.txt',
         ]);
       });
-      results.fetchResultsURLs({
-        'builderName': 'Mock Builder',
-        'testName': 'userscripts/another-test.html',
-        'failureTypeList': ['LEAK'],
-      }).then(function(resultURLs) {
-        assert.deepEqual(resultURLs, [
-          MockResultsBaseURL + '/userscripts/another-test-leak-log.txt'
-        ]);
-      });
-    }).then(function() {
-      assert.deepEqual(probedURLs, [
-        MockResultsBaseURL + '/userscripts/another-test-expected.png',
-        MockResultsBaseURL + '/userscripts/another-test-actual.png',
-        MockResultsBaseURL + '/userscripts/another-test-diff.png',
-        MockResultsBaseURL + '/userscripts/another-test-crash-log.txt',
-        MockResultsBaseURL + '/userscripts/taco-expected.png',
-        MockResultsBaseURL + '/userscripts/taco-actual.png',
-        MockResultsBaseURL + '/userscripts/taco-diff.png',
-        MockResultsBaseURL + '/userscripts/taco-actual.txt',
-        MockResultsBaseURL + '/userscripts/taco-expected.txt',
-        MockResultsBaseURL + '/userscripts/taco-diff.txt',
-        MockResultsBaseURL + '/userscripts/another-test-leak-log.txt',
-      ]);
-      done();
     });
   });
 });