More fixing tests to make bots happy.
R=pquitslund@google.com
Review URL: https://chromiumcodereview.appspot.com//960113004
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e535551..2a87d45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
-# 0.1.5+1
+# 0.1.5+1, 0.1.5+2
-* Fix test file to work in main Dart repo test runner.
+* Fix test files to work in main Dart repo test runner.
# 0.1.5
diff --git a/pubspec.yaml b/pubspec.yaml
index f8a58ee..93ab425 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: dart_style
-version: 0.1.5+1
+version: 0.1.5+2
author: Dart Team <misc@dartlang.org>
description: Opinionated, automatic Dart source code formatter.
homepage: https://github.com/dart-lang/dart_style
diff --git a/test/command_line_test.dart b/test/command_line_test.dart
index 8b130b6..47f817a 100644
--- a/test/command_line_test.dart
+++ b/test/command_line_test.dart
@@ -9,6 +9,7 @@
import 'package:path/path.dart' as p;
import 'package:scheduled_test/descriptor.dart' as d;
import 'package:scheduled_test/scheduled_test.dart';
+import 'package:scheduled_test/scheduled_stream.dart';
import 'utils.dart';
@@ -92,9 +93,14 @@
d.file("d_good.dart", formattedSource)
]).create();
+ var aBad = p.join("code", "a_bad.dart");
+ var cBad = p.join("code", "c_bad.dart");
+
var process = runFormatterOnDir(["--dry-run"]);
- process.stdout.expect(p.join("code", "a_bad.dart"));
- process.stdout.expect(p.join("code", "c_bad.dart"));
+
+ // The order isn't specified.
+ process.stdout.expect(either(aBad, cBad));
+ process.stdout.expect(either(aBad, cBad));
process.shouldExit();
});
diff --git a/test/utils.dart b/test/utils.dart
index 30a273a..8fba63d 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -22,7 +22,13 @@
var formatterPath = p.join(
p.dirname(p.fromUri(Platform.script)), "..", "bin", "format.dart");
- args.insertAll(0, ["--package-root=${Platform.packageRoot}", formatterPath]);
+ args.insert(0, formatterPath);
+
+ // Use the same package root, if there is one.
+ if (Platform.packageRoot.isNotEmpty) {
+ args.insert(0, "--package-root=${Platform.packageRoot}");
+ }
+
return new ScheduledProcess.start(Platform.executable, args);
}