Add Timeout.none.

lib/src/backend/metadata.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.backend.metadata;
 
 import 'dart:collection';
 
 import '../backend/operating_system.dart';
 import '../backend/test_platform.dart';
@@ skipping 102 matching lines @@
       throw new ArgumentError(
           '"skip" must be a String or a bool, was "$skip".');
     }
   }
 
   /// Dezerializes the result of [Metadata.serialize] into a new [Metadata].
   Metadata.deserialize(serialized)
       : testOn = serialized['testOn'] == null
             ? PlatformSelector.all
             : new PlatformSelector.parse(serialized['testOn']),
-        timeout = serialized['timeout']['duration'] == null
-            ? new Timeout.factor(serialized['timeout']['scaleFactor'])
-            : new Timeout(new Duration(
-                microseconds: serialized['timeout']['duration'])),
+        timeout = _deserializeTimeout(serialized['timeout']),
         skip = serialized['skip'],
         skipReason = serialized['skipReason'],
         verboseTrace = serialized['verboseTrace'],
         onPlatform = new Map.fromIterable(serialized['onPlatform'],
             key: (pair) => new PlatformSelector.parse(pair.first),
             value: (pair) => new Metadata.deserialize(pair.last));
 
+  /// Deserializes timeout from the format returned by [_serializeTimeout].
+  static _deserializeTimeout(serialized) {
+    if (serialized == 'none') return Timeout.none;
+    var scaleFactor = serialized['scaleFactor'];
+    if (scaleFactor != null) return new Timeout.factor(scaleFactor);
+    return new Timeout(
+        new Duration(microseconds: serialized['duration']));
+  }
+
   /// Return a new [Metadata] that merges [this] with [other].
   ///
   /// If the two [Metadata]s have conflicting properties, [other] wins.
   Metadata merge(Metadata other) =>
       new Metadata(
           testOn: testOn.intersect(other.testOn),
           timeout: timeout.merge(other.timeout),
           skip: skip || other.skip,
           verboseTrace: verboseTrace || other.verboseTrace,
           skipReason: other.skipReason == null ? skipReason : other.skipReason,
@@ skipping 31 matching lines @@
   /// [new Metadata.deserialize].
   serialize() {
     // Make this a list to guarantee that the order is preserved.
     var serializedOnPlatform = [];
     onPlatform.forEach((key, value) {
       serializedOnPlatform.add([key.toString(), value.serialize()]);
     });
 
     return {
       'testOn': testOn == PlatformSelector.all ? null : testOn.toString(),
-      'timeout': {
-        'duration': timeout.duration == null
-            ? null
-            : timeout.duration.inMicroseconds,
-        'scaleFactor': timeout.scaleFactor
-      },
+      'timeout': _serializeTimeout(timeout),
       'skip': skip,
       'skipReason': skipReason,
       'verboseTrace': verboseTrace,
       'onPlatform': serializedOnPlatform
     };
   }
+
+  /// Serializes timeout into a JSON-safe object.
+  _serializeTimeout(Timeout timeout) {
+    if (timeout == Timeout.none) return 'none';
+    return {
+      'duration': timeout.duration == null
+          ? null
+          : timeout.duration.inMicroseconds,
+      'scaleFactor': timeout.scaleFactor
+    };
+  }
 }