Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Unified Diff: test/test_pub.dart

Issue 1215833002: Use the new test runner. (Closed) Base URL: git@github.com:dart-lang/pub.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: test/test_pub.dart
diff --git a/test/test_pub.dart b/test/test_pub.dart
index d517837b8c0091a14e8e5fcd0124dbbc9ea34745..1d72496c4e953ed2736d01b807adebfecd7b77dc 100644
--- a/test/test_pub.dart
+++ b/test/test_pub.dart
@@ -43,7 +43,6 @@ import 'package:scheduled_test/scheduled_stream.dart';
import 'package:scheduled_test/scheduled_test.dart' hide fail;
import 'package:shelf/shelf.dart' as shelf;
import 'package:shelf/shelf_io.dart' as shelf_io;
-import 'package:unittest/compact_vm_config.dart';
import 'package:yaml/yaml.dart';
import 'descriptor.dart' as d;
@@ -51,14 +50,6 @@ import 'serve_packages.dart';
export 'serve_packages.dart';
-/// This should be called at the top of a test file to set up an appropriate
-/// test configuration for the machine running the tests.
-initConfig() {
- useCompactVMConfiguration();
- filterStacks = true;
- unittestConfiguration.timeout = null;
-}
Bob Nystrom 2015/06/26 23:04:10 \o/
-
/// The current [HttpServer] created using [serve].
var _server;
@@ -210,7 +201,6 @@ void serve([List<d.Descriptor> contents]) {
schedule(() {
return _closeServer().then((_) {
return shelf_io.serve((request) {
- currentSchedule.heartbeat();
var path = p.posix.fromUri(request.url.path.replaceFirst("/", ""));
_requestedPaths.add(path);
@@ -371,14 +361,6 @@ void solo_integration(String description, void body()) =>
void _integration(String description, void body(), [Function testFn]) {
testFn(description, () {
- // TODO(nweiz): remove this when issue 15362 is fixed.
- currentSchedule.timeout *= 2;
-
- // The windows bots are very slow, so we increase the default timeout.
- if (Platform.operatingSystem == "windows") {
- currentSchedule.timeout *= 2;
- }
-
_sandboxDir = createSystemTempDir();
d.defaultRoot = sandboxDir;
currentSchedule.onComplete.schedule(() => deleteEntry(_sandboxDir),
@@ -650,10 +632,6 @@ String get _packageRoot => p.absolute(Platform.packageRoot);
/// This also increases the [Schedule] timeout to 30 seconds on Windows,
/// where Git runs really slowly.
void ensureGit() {
- if (Platform.operatingSystem == "windows") {
- currentSchedule.timeout = new Duration(seconds: 30);
- }
-
if (!gitlib.isInstalled) {
throw new Exception("Git must be installed to run this test.");
}

Powered by Google App Engine
This is Rietveld 408576698