From 16318e7a1b4cbc5612f12e319fcd1f0fff6d17f3 Mon Sep 17 00:00:00 2001
From: "nweiz@google.com" <nweiz@google.com>
Date: Thu, 21 Aug 2014 00:29:10 +0000
Subject: [PATCH] Fix tests for pub global activate.
R=rnystrom@google.com
Review URL: https://codereview.chromium.org//496583002
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@39440 260f80e4-7a28-3924-810f-c04153c831b5
---
bin/pub.dart | 4 +++-
lib/src/global_packages.dart | 8 +++++++-
lib/src/solver/backtracking_solver.dart | 3 ++-
lib/src/solver/version_solver.dart | 11 ++++++-----
test/get/hosted/get_test.dart | 7 +++++--
test/get/path/nonexistent_dir_test.dart | 9 ++++++---
.../activate/activate_git_after_hosted_test.dart | 1 +
.../activate/activate_hosted_after_git_test.dart | 3 ++-
.../activate/activate_hosted_after_path_test.dart | 3 ++-
test/global/activate/cached_package_test.dart | 5 +++--
test/global/activate/different_version_test.dart | 9 +++++----
test/global/activate/empty_constraint_test.dart | 4 +++-
test/global/activate/git_package_test.dart | 5 +++--
.../global/activate/ignores_active_version_test.dart | 9 +++++----
.../activate/reactivating_git_upgrades_test.dart | 12 +++++++-----
test/global/activate/uncached_package_test.dart | 8 ++++----
.../deactivate_and_reactivate_package_test.dart | 8 ++++----
.../fail_gracefully_on_missing_package_test.dart | 5 ++++-
18 files changed, 72 insertions(+), 42 deletions(-)
diff --git a/bin/pub.dart b/bin/pub.dart
index 35b8c90e..8f7fa4e3 100644
--- a/bin/pub.dart
+++ b/bin/pub.dart
@@ -17,6 +17,7 @@ import '../lib/src/http.dart';
import '../lib/src/io.dart';
import '../lib/src/log.dart' as log;
import '../lib/src/sdk.dart' as sdk;
+import '../lib/src/solver/version_solver.dart';
import '../lib/src/utils.dart';
void main(List<String> arguments) {
@@ -115,7 +116,8 @@ int chooseExitCode(exception) {
while (exception is WrappedException) exception = exception.innerError;
if (exception is HttpException || exception is http.ClientException ||
- exception is SocketException || exception is PubHttpException) {
+ exception is SocketException || exception is PubHttpException ||
+ exception is DependencyNotFoundException) {
return exit_codes.UNAVAILABLE;
} else if (exception is FormatException || exception is DataException) {
return exit_codes.DATA;
diff --git a/lib/src/global_packages.dart b/lib/src/global_packages.dart
index 57f806a1..d7625073 100644
--- a/lib/src/global_packages.dart
+++ b/lib/src/global_packages.dart
@@ -110,7 +110,13 @@ class GlobalPackages {
// Resolve it and download its dependencies.
return resolveVersions(SolveType.GET, cache.sources, root).then((result) {
- if (!result.succeeded) throw result.error;
+ if (!result.succeeded) {
+ // If the package specified by the user doesn't exist, we want to
+ // surface that as a [DataError] with the associated exit code.
+ if (result.error.package != dep.name) throw result.error;
+ if (result.error is NoVersionException) dataError(result.error.message);
+ throw result.error;
+ }
result.showReport(SolveType.GET);
// Make sure all of the dependencies are locally installed.
diff --git a/lib/src/solver/backtracking_solver.dart b/lib/src/solver/backtracking_solver.dart
index d8cc66ad..cf12722f 100644
--- a/lib/src/solver/backtracking_solver.dart
+++ b/lib/src/solver/backtracking_solver.dart
@@ -700,7 +700,8 @@ class Traverser {
var pubDep = override == null ?
new PackageDep(depName, "hosted", constraint, depName) :
override.withConstraint(constraint);
- return _registerDependency(new Dependency("pub itself", null, pubDep));
+ return _registerDependency(
+ new Dependency("pub itself", Version.none, pubDep));
}));
}
diff --git a/lib/src/solver/version_solver.dart b/lib/src/solver/version_solver.dart
index 471f0953..e2af2d41 100644
--- a/lib/src/solver/version_solver.dart
+++ b/lib/src/solver/version_solver.dart
@@ -280,13 +280,16 @@ class Dependency {
final String depender;
/// The version of the depender that has this dependency.
- ///
- /// This will be `null` when [depender] is the magic "pub itself" dependency.
final Version dependerVersion;
/// The package being depended on.
final PackageDep dep;
+ /// Whether [depender] is a magic dependency (e.g. "pub itself" or "pub global
+ /// activate").
+ bool get isMagic => depender.contains(" ");
+
+
Dependency(this.depender, this.dependerVersion, this.dep);
String toString() => '$depender $dependerVersion -> $dep';
@@ -347,9 +350,7 @@ abstract class SolveFailure implements ApplicationException {
for (var dep in sorted) {
buffer.writeln();
buffer.write("- ${log.bold(dep.depender)}");
- if (dep.dependerVersion != null) {
- buffer.write(" ${dep.dependerVersion}");
- }
+ if (!dep.isMagic) buffer.write(" ${dep.dependerVersion}");
buffer.write(" ${_describeDependency(dep.dep)}");
}
diff --git a/test/get/hosted/get_test.dart b/test/get/hosted/get_test.dart
index 2779da1a..fa2ffe43 100644
--- a/test/get/hosted/get_test.dart
+++ b/test/get/hosted/get_test.dart
@@ -4,6 +4,7 @@
library pub_tests;
+import '../../../lib/src/exit_codes.dart' as exit_codes;
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
@@ -25,7 +26,9 @@ main() {
d.appDir({"bad name!": "1.2.3"}).create();
- pubGet(error: new RegExp(
- r"Could not find package bad name! at http://localhost:\d+\."));
+ pubGet(
+ error: new RegExp(
+ r"Could not find package bad name! at http://localhost:\d+\."),
+ exitCode: exit_codes.UNAVAILABLE);
});
}
diff --git a/test/get/path/nonexistent_dir_test.dart b/test/get/path/nonexistent_dir_test.dart
index 95698fc5..6a983c4c 100644
--- a/test/get/path/nonexistent_dir_test.dart
+++ b/test/get/path/nonexistent_dir_test.dart
@@ -4,6 +4,7 @@
import 'package:path/path.dart' as path;
+import '../../../lib/src/exit_codes.dart' as exit_codes;
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
@@ -18,8 +19,10 @@ main() {
})
]).create();
- pubGet(error: """Could not find package foo at "$badPath".
-Depended on by:
-- myapp 0.0.0""");
+ pubGet(error: """
+ Could not find package foo at "$badPath".
+ Depended on by:
+ - myapp 0.0.0""",
+ exitCode: exit_codes.UNAVAILABLE);
});
}
\ No newline at end of file
diff --git a/test/global/activate/activate_git_after_hosted_test.dart b/test/global/activate/activate_git_after_hosted_test.dart
index a553f5f4..9aea6fdb 100644
--- a/test/global/activate/activate_git_after_hosted_test.dart
+++ b/test/global/activate/activate_git_after_hosted_test.dart
@@ -31,6 +31,7 @@ main() {
output: """
Package foo is currently active at version 1.0.0.
Resolving dependencies...
+ + foo 1.0.0 from git ../foo.git
Activated foo 1.0.0 from Git repository "../foo.git".""");
// Should now run the git one.
diff --git a/test/global/activate/activate_hosted_after_git_test.dart b/test/global/activate/activate_hosted_after_git_test.dart
index 9afb49fd..296490ff 100644
--- a/test/global/activate/activate_hosted_after_git_test.dart
+++ b/test/global/activate/activate_hosted_after_git_test.dart
@@ -31,8 +31,9 @@ main() {
var path = canonicalize(p.join(sandboxDir, "foo"));
schedulePub(args: ["global", "activate", "foo"], output: """
Package foo is currently active from Git repository "../foo.git".
- Downloading foo 2.0.0...
Resolving dependencies...
+ + foo 2.0.0
+ Downloading foo 2.0.0...
Activated foo 2.0.0.""");
// Should now run the hosted one.
diff --git a/test/global/activate/activate_hosted_after_path_test.dart b/test/global/activate/activate_hosted_after_path_test.dart
index 6dec06bd..6cd26d00 100644
--- a/test/global/activate/activate_hosted_after_path_test.dart
+++ b/test/global/activate/activate_hosted_after_path_test.dart
@@ -31,8 +31,9 @@ main() {
var path = canonicalize(p.join(sandboxDir, "foo"));
schedulePub(args: ["global", "activate", "foo"], output: """
Package foo is currently active at path "$path".
- Downloading foo 2.0.0...
Resolving dependencies...
+ + foo 2.0.0
+ Downloading foo 2.0.0...
Activated foo 2.0.0.""");
// Should now run the hosted one.
diff --git a/test/global/activate/cached_package_test.dart b/test/global/activate/cached_package_test.dart
index 8865883b..c9071c75 100644
--- a/test/global/activate/cached_package_test.dart
+++ b/test/global/activate/cached_package_test.dart
@@ -17,8 +17,9 @@ main() {
schedulePub(args: ["cache", "add", "foo"]);
schedulePub(args: ["global", "activate", "foo"], output: """
-Resolving dependencies...
-Activated foo 1.0.0.""");
+ Resolving dependencies...
+ + foo 1.0.0
+ Activated foo 1.0.0.""");
// Should be in global package cache.
d.dir(cachePath, [
diff --git a/test/global/activate/different_version_test.dart b/test/global/activate/different_version_test.dart
index 57fa511c..d9542f73 100644
--- a/test/global/activate/different_version_test.dart
+++ b/test/global/activate/different_version_test.dart
@@ -18,9 +18,10 @@ main() {
// Activating it again with a different constraint changes the version.
schedulePub(args: ["global", "activate", "foo", ">1.0.0"], output: """
-Package foo is currently active at version 1.0.0.
-Downloading foo 2.0.0...
-Resolving dependencies...
-Activated foo 2.0.0.""");
+ Package foo is currently active at version 1.0.0.
+ Resolving dependencies...
+ + foo 2.0.0
+ Downloading foo 2.0.0...
+ Activated foo 2.0.0.""");
});
}
diff --git a/test/global/activate/empty_constraint_test.dart b/test/global/activate/empty_constraint_test.dart
index 6b8b7fbb..4d29194d 100644
--- a/test/global/activate/empty_constraint_test.dart
+++ b/test/global/activate/empty_constraint_test.dart
@@ -14,7 +14,9 @@ main() {
]);
schedulePub(args: ["global", "activate", "foo", ">1.1.0"],
- error: "Package foo has no versions that match >1.1.0.",
+ error: """
+ Package foo has no versions that match >1.1.0 derived from:
+ - pub global activate depends on version >1.1.0""",
exitCode: exit_codes.DATA);
});
}
diff --git a/test/global/activate/git_package_test.dart b/test/global/activate/git_package_test.dart
index 4426c74c..eea65e8e 100644
--- a/test/global/activate/git_package_test.dart
+++ b/test/global/activate/git_package_test.dart
@@ -19,7 +19,8 @@ main() {
schedulePub(args: ["global", "activate", "-sgit", "../foo.git"],
output: '''
-Resolving dependencies...
-Activated foo 1.0.0 from Git repository "../foo.git".''');
+ Resolving dependencies...
+ + foo 1.0.0 from git ../foo.git
+ Activated foo 1.0.0 from Git repository "../foo.git".''');
});
}
diff --git a/test/global/activate/ignores_active_version_test.dart b/test/global/activate/ignores_active_version_test.dart
index 36508558..e578b81d 100644
--- a/test/global/activate/ignores_active_version_test.dart
+++ b/test/global/activate/ignores_active_version_test.dart
@@ -18,9 +18,10 @@ main() {
// Activating it again resolves to the new best version.
schedulePub(args: ["global", "activate", "foo", ">1.0.0"], output: """
-Package foo is currently active at version 1.2.3.
-Downloading foo 1.3.0...
-Resolving dependencies...
-Activated foo 1.3.0.""");
+ Package foo is currently active at version 1.2.3.
+ Resolving dependencies...
+ + foo 1.3.0
+ Downloading foo 1.3.0...
+ Activated foo 1.3.0.""");
});
}
diff --git a/test/global/activate/reactivating_git_upgrades_test.dart b/test/global/activate/reactivating_git_upgrades_test.dart
index 6a25d23f..a07d667e 100644
--- a/test/global/activate/reactivating_git_upgrades_test.dart
+++ b/test/global/activate/reactivating_git_upgrades_test.dart
@@ -17,8 +17,9 @@ main() {
schedulePub(args: ["global", "activate", "-sgit", "../foo.git"],
output: '''
-Resolving dependencies...
-Activated foo 1.0.0 from Git repository "../foo.git".''');
+ Resolving dependencies...
+ + foo 1.0.0 from git ../foo.git
+ Activated foo 1.0.0 from Git repository "../foo.git".''');
d.git('foo.git', [
d.libPubspec("foo", "1.0.1")
@@ -27,8 +28,9 @@ Activated foo 1.0.0 from Git repository "../foo.git".''');
// Activating it again pulls down the latest commit.
schedulePub(args: ["global", "activate", "-sgit", "../foo.git"],
output: '''
-Package foo is currently active from Git repository "../foo.git".
-Resolving dependencies...
-Activated foo 1.0.1 from Git repository "../foo.git".''');
+ Package foo is currently active from Git repository "../foo.git".
+ Resolving dependencies...
+ + foo 1.0.1 from git ../foo.git
+ Activated foo 1.0.1 from Git repository "../foo.git".''');
});
}
diff --git a/test/global/activate/uncached_package_test.dart b/test/global/activate/uncached_package_test.dart
index a134ab6f..9f9041db 100644
--- a/test/global/activate/uncached_package_test.dart
+++ b/test/global/activate/uncached_package_test.dart
@@ -17,10 +17,10 @@ main() {
]);
schedulePub(args: ["global", "activate", "foo"], output: """
-Downloading foo 1.2.3...
-Resolving dependencies...
-Activated foo 1.2.3.
- """);
+ Resolving dependencies...
+ + foo 1.2.3 (2.0.0-wildly.unstable available)
+ Downloading foo 1.2.3...
+ Activated foo 1.2.3.""");
// Should be in global package cache.
d.dir(cachePath, [
diff --git a/test/global/deactivate/deactivate_and_reactivate_package_test.dart b/test/global/deactivate/deactivate_and_reactivate_package_test.dart
index b1c6005d..17f02407 100644
--- a/test/global/deactivate/deactivate_and_reactivate_package_test.dart
+++ b/test/global/deactivate/deactivate_and_reactivate_package_test.dart
@@ -20,9 +20,9 @@ main() {
// Activating again should forget the old version.
schedulePub(args: ["global", "activate", "foo"], output: """
-Downloading foo 2.0.0...
-Resolving dependencies...
-Activated foo 2.0.0.
- """);
+ Resolving dependencies...
+ + foo 2.0.0
+ Downloading foo 2.0.0...
+ Activated foo 2.0.0.""");
});
}
diff --git a/test/hosted/fail_gracefully_on_missing_package_test.dart b/test/hosted/fail_gracefully_on_missing_package_test.dart
index 527f597a..60be82ff 100644
--- a/test/hosted/fail_gracefully_on_missing_package_test.dart
+++ b/test/hosted/fail_gracefully_on_missing_package_test.dart
@@ -4,8 +4,10 @@
library pub_tests;
+import '../../lib/src/exit_codes.dart' as exit_codes;
import '../descriptor.dart' as d;
import '../test_pub.dart';
+import '../test_pub.dart';
main() {
initConfig();
@@ -19,7 +21,8 @@ main() {
pubCommand(command, error: new RegExp(r"""
Could not find package foo at http://localhost:\d+\.
Depended on by:
-- myapp""", multiLine: true));
+- myapp""", multiLine: true),
+ exitCode: exit_codes.UNAVAILABLE);
});
});
}
--
GitLab