From 9e5ba648afb1d8f7dafc0a210cc9be509fc113ab Mon Sep 17 00:00:00 2001
From: Sigurd Meldgaard <sigurdm@google.com>
Date: Fri, 24 Mar 2023 17:17:15 +0000
Subject: [PATCH] Bump pub to 8434b40d6a21dece68c4880e59dbdedfbd6bd7e5

Changes:
```
> git log --format="%C(auto) %h %s" 4bd757c..8434b40
 https://dart.googlesource.com/pub.git/+/8434b40d Be more quiet when doing implicit pub get (3847)
 https://dart.googlesource.com/pub.git/+/29a7c099 Dependency services: preserve pub.dartlang.org in lockfile (3846)
 https://dart.googlesource.com/pub.git/+/41963ddd Api entrypoint for ensuring resolution is up-to-date (3844)
 https://dart.googlesource.com/pub.git/+/92f6bf79 If pinned to an exact version, keep the pin when bumping (3736)
 https://dart.googlesource.com/pub.git/+/c68939ba Add missing closing quote in dependency override example (3843)
 https://dart.googlesource.com/pub.git/+/0cdeb85f Hint if version is not an incremental update (3840)
 https://dart.googlesource.com/pub.git/+/c795dcd8 Upgrade language version to 3.0 (3822)

```

Diff: https://dart.googlesource.com/pub.git/+/4bd757ce1dad04035fb0dbc6156879af23d8b3b8..8434b40d6a21dece68c4880e59dbdedfbd6bd7e5/
Change-Id: Ia0b7e8742522904454c318a381f983398be82838
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/291066
Commit-Queue: Sigurd Meldgaard <sigurdm@google.com>
Reviewed-by: Jonas Jensen <jonasfj@google.com>
---
 DEPS                                    |  2 +-
 pkg/dartdev/test/commands/pub_test.dart | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/DEPS b/DEPS
index 689f3a8cad9..91d3522979b 100644
--- a/DEPS
+++ b/DEPS
@@ -156,7 +156,7 @@ vars = {
   "path_rev": "24b58a2499440cc3d12d2b3c2f52b95f91ff1c0a",
   "pool_rev": "694cfd867d8d84857fc42a8d07933013f0d25305",
   "protobuf_rev": "b90a4c44d56075eb23ee38ae56ce0febfd7f280f",
-  "pub_rev": "4bd757ce1dad04035fb0dbc6156879af23d8b3b8", # disable rev_sdk_deps.dart
+  "pub_rev": "8434b40d6a21dece68c4880e59dbdedfbd6bd7e5", # disable rev_sdk_deps.dart
   "pub_semver_rev": "c0e6ea74ccfbfdb2ef54c7cd9ad31455ca8e481f",
   "shelf_rev": "9a792b49f07bd9d310d83cd103035cc60a9956af",
   "source_map_stack_trace_rev": "45ea3688b6bec1eb565c38c4e28f37b01f8a0fa9",
diff --git a/pkg/dartdev/test/commands/pub_test.dart b/pkg/dartdev/test/commands/pub_test.dart
index b7bcb1170ef..e26aba9293c 100644
--- a/pkg/dartdev/test/commands/pub_test.dart
+++ b/pkg/dartdev/test/commands/pub_test.dart
@@ -70,12 +70,23 @@ void pub() {
     expect(result.stderr, result2.stderr);
   });
 
-  test('failure', () async {
-    p = project(mainSrc: 'int get foo => 1;\n');
+  test('solve failure', () async {
+    p = project(pubspec: {
+      'name': 'myapp',
+      'environment': {'sdk': '^2.19.0'},
+      'dependencies': {
+        'foo': {'path': '../not_to_be_found'},
+      },
+    });
     var result = await p.run(['pub', 'deps']);
-    expect(result.exitCode, 65);
+    expect(result.exitCode, 66);
     expect(result.stdout, isEmpty);
-    expect(result.stderr, contains('No pubspec.lock file found'));
+    expect(
+      result.stderr,
+      contains(
+        '(could not find package foo at "../not_to_be_found"), version solving failed.',
+      ),
+    );
   });
 
   test('failure unknown option', () async {