fix(test): Increase automatedBrowser timeout to fetch fxaStatus. (#5274) r=vladikoff

* fix(test): Increase automatedBrowser timeout to fetch fxaStatus.

200ms does not seem to be enough on Circle. Bump to 500ms.

fixes #5247

* refactor(test): Move the flaky handshake tests to the top of the circle list.

app/scripts/models/auth_brokers/base.js

@@ -129,7 +129,7 @@ define(function (require, exports, module) {
      * @private
      */
     _fetchFxaStatus () {
-      const TEST_REQUEST_DELAY_MS = this.isAutomatedBrowser() ? 200 : 0;
+      const TEST_REQUEST_DELAY_MS = this.isAutomatedBrowser() ? 500 : 0;
 
       const channel = this._notificationChannel;
       return p().delay(TEST_REQUEST_DELAY_MS)

tests/intern_functional_circle.js

@@ -8,6 +8,8 @@ define([
 ], function (intern, selectCircleTests) {
 
   intern.functionalSuites = selectCircleTests([
+    'tests/functional/sync_v3_sign_up',
+    'tests/functional/fx_desktop_handshake',
     'tests/functional/settings_secondary_emails.js',
     // flaky tests go above here.
     'tests/functional/avatar',
@@ -21,7 +23,6 @@ define([
     'tests/functional/cookies_disabled',
     'tests/functional/delete_account',
     'tests/functional/force_auth',
-    'tests/functional/fx_desktop_handshake',
     'tests/functional/fx_fennec_v1_force_auth',
     'tests/functional/fx_fennec_v1_sign_in',
     'tests/functional/fx_fennec_v1_sign_up',
@@ -52,7 +53,6 @@ define([
     'tests/functional/sync_v3_force_auth',
     'tests/functional/sync_v3_settings',
     'tests/functional/sync_v3_sign_in',
-    'tests/functional/sync_v3_sign_up',
   ]);
 
   return intern;