Teach the network simulator to wait for Promises.

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

 <!--
 Copyright 2014 The Chromium Authors. All rights reserved.
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
 
 <link rel="import" href="../../lib/network-simulator.html">
 
 <script>
 (function() {
@@ skipping 59 matching lines @@
     simulator.probe = function(url) {
       probedURLs.push(url);
       if (url.endsWith('.txt'))
         return Promise.resolve();
       else if (/taco.+png$/.test(url))
         return Promise.resolve();
       else
         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-actual.txt',
           MockResultsBaseURL + '/userscripts/taco-expected.txt',
-          MockResultsBaseURL + '/userscripts/taco-actual.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();
     });
   });
 });
 
 })();
 </script>