Change ScheduledProcess's output streams over to be ScheduledStreams.

sdk/lib/_internal/pub/test/pub_uploader_test.dart

Index: sdk/lib/_internal/pub/test/pub_uploader_test.dart
diff --git a/sdk/lib/_internal/pub/test/pub_uploader_test.dart b/sdk/lib/_internal/pub/test/pub_uploader_test.dart
index 7f0bde9e609b4601973c8d1a77a9c32791b06ffe..4d73569f4ea1fec4d57fca0d2f1ab5ffe70155a4 100644
--- a/sdk/lib/_internal/pub/test/pub_uploader_test.dart
+++ b/sdk/lib/_internal/pub/test/pub_uploader_test.dart
@@ -73,7 +73,7 @@ main() {
       }), completes);
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    pub.stdout.expect('Good job!');
     pub.shouldExit(exit_codes.SUCCESS);
   });
 
@@ -91,7 +91,7 @@ main() {
       request.response.close();
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    pub.stdout.expect('Good job!');
     pub.shouldExit(exit_codes.SUCCESS);
   });
 
@@ -111,7 +111,7 @@ main() {
       request.response.close();
     });
 
-    expect(pub.nextLine(), completion(equals('Good job!')));
+    pub.stdout.expect('Good job!');
     pub.shouldExit(exit_codes.SUCCESS);
   });
 
@@ -130,7 +130,7 @@ main() {
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Bad job!')));
+    pub.stderr.expect('Bad job!');
     pub.shouldExit(1);
   });
 
@@ -150,7 +150,7 @@ main() {
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Bad job!')));
+    pub.stderr.expect('Bad job!');
     pub.shouldExit(1);
   });
 
@@ -164,8 +164,9 @@ main() {
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Invalid server response:')));
-    expect(pub.nextErrLine(), completion(equals('{not json')));
+    pub.stderr.expect(emitsString(
+        'Invalid server response:\n'
+        '{not json'));

[Bob Nystrom, 2014/02/14 17:55:02]

Be consistent about using emitsString() or multiple calls to .stderr.expect.
(I'd just use multiple calls.)

[nweiz, 2014/02/18 22:01:10]

I chose [emitsString] for consistency with longer multiline expectations, where
multiple calls to [expect] get very cumbersome. Previously we had been using
multiple calls by necessity, since there was no facility for matching multiple
lines in a single call, but now we do so I thought it would be cleaner to use
it.

I can switch to multiple calls if you don't mind the inconsistency between
two-line expectations and many-line expectations.

[Bob Nystrom, 2014/02/18 22:12:59]

That makes sense to me too, but in that case I'd probably use emitsString() for
even the two line cases. I thought I saw a bunch that still used separate expect
calls for that.

But, again, I don't have a strong preference here, so don't spend too much time
on it.

     pub.shouldExit(1);
   });
 
@@ -179,8 +180,9 @@ main() {
       request.response.close();
     });
 
-    expect(pub.nextErrLine(), completion(equals('Invalid server response:')));
-    expect(pub.nextErrLine(), completion(equals('{not json')));
+    pub.stderr.expect(emitsString(
+        'Invalid server response:\n'
+        '{not json'));
     pub.shouldExit(1);
   });
 }