From eb70a7c299879d8d97b3bb09dd2d651988e2d214 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 22 Jul 2014 14:24:17 -0700
Subject: [PATCH] Make old cli test pass.

We might want to revisit this after polishing error messages.

Still doesn't pass with METEOR_WAREHOUSE_DIR set from self-test.
---
 tools/tests/old/cli-test.sh | 44 ++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/tools/tests/old/cli-test.sh b/tools/tests/old/cli-test.sh
index 779bacb541..2264b9c2f2 100755
--- a/tools/tests/old/cli-test.sh
+++ b/tools/tests/old/cli-test.sh
@@ -41,14 +41,14 @@ cd "$TEST_TMPDIR"
 ## Begin actual tests
 
 echo "... --help"
-$METEOR --help | grep "List available" >> $OUTPUT
+$METEOR --help | grep "List the packages explicitly used" >> $OUTPUT
 $METEOR run --help | grep "Port to listen" >> $OUTPUT
 $METEOR test-packages --help | grep "Port to listen" >> $OUTPUT
 $METEOR create --help | grep "Make a subdirectory" >> $OUTPUT
 $METEOR update --help | grep "Sets the version" >> $OUTPUT
 $METEOR add --help | grep "Adds packages" >> $OUTPUT
 $METEOR remove --help | grep "Removes a package" >> $OUTPUT
-$METEOR list --help | grep "Without arguments" >> $OUTPUT
+$METEOR list --help | grep "This will not list transitive dependencies" >> $OUTPUT
 $METEOR bundle --help | grep "Package this project" >> $OUTPUT
 $METEOR mongo --help | grep "Opens a Mongo" >> $OUTPUT
 $METEOR deploy --help | grep "Deploys the project" >> $OUTPUT
@@ -62,7 +62,7 @@ $METEOR 2>&1 | grep "run: You're not in" >> $OUTPUT
 $METEOR run 2>&1 | grep "run: You're not in" >> $OUTPUT
 $METEOR add foo 2>&1 | grep "add: You're not in" >> $OUTPUT
 $METEOR remove foo 2>&1 | grep "remove: You're not in" >> $OUTPUT
-$METEOR list --using 2>&1 | grep "list: You're not in" >> $OUTPUT
+$METEOR list 2>&1 | grep "list: You're not in" >> $OUTPUT
 $METEOR bundle foo.tar.gz 2>&1 | grep "bundle: You're not in" >> $OUTPUT
 $METEOR mongo 2>&1 | grep "mongo: You're not in" >> $OUTPUT
 $METEOR deploy automated-test 2>&1 | grep "deploy: You're not in" >> $OUTPUT
@@ -82,13 +82,13 @@ cd .meteor
 
 echo "... add/remove/list"
 
-$METEOR list | grep "backbone" >> $OUTPUT
-! $METEOR list --using 2>&1 | grep "backbone" >> $OUTPUT
+$METEOR search backbone | grep "backbone" >> $OUTPUT
+! $METEOR list 2>&1 | grep "backbone" >> $OUTPUT
 $METEOR add backbone 2>&1 | grep "backbone:" | grep -v "no such package" | >> $OUTPUT
-$METEOR list --using | grep "backbone" >> $OUTPUT
+$METEOR list | grep "backbone" >> $OUTPUT
 grep backbone packages >> $OUTPUT # remember, we are already in .meteor
-$METEOR remove backbone 2>&1 | grep "backbone: removed" >> $OUTPUT
-! $METEOR list --using 2>&1 | grep "backbone" >> $OUTPUT
+$METEOR remove backbone 2>&1 | grep "Removed constraint backbone" >> $OUTPUT
+! $METEOR list 2>&1 | grep "backbone" >> $OUTPUT
 
 echo "... bundle"
 
@@ -114,7 +114,7 @@ PORT=9100
 $METEOR -p $PORT >> $OUTPUT 2>&1 &
 METEOR_PID=$!
 
-sleep 2 # XXX XXX lame
+sleep 5 # XXX XXX lame
 
 test -d .meteor/local/db
 ps ax | grep -e "$MONGOMARK" | grep -v grep >> $OUTPUT
@@ -136,7 +136,7 @@ echo "... rerun"
 $METEOR -p $PORT >> $OUTPUT 2>&1 &
 METEOR_PID=$!
 
-sleep 2 # XXX XXX lame
+sleep 5 # XXX XXX lame
 
 ps ax | grep -e "$MONGOMARK" | grep -v grep >> $OUTPUT
 curl -s "http://localhost:$PORT" >> $OUTPUT
@@ -151,6 +151,10 @@ echo "... test-packages"
 
 mkdir -p "$TEST_TMPDIR/local-packages/die-now/"
 cat > "$TEST_TMPDIR/local-packages/die-now/package.js" <<EOF
+Package.describe({
+  summary: "die-now",
+  version: "1.0.0"
+});
 Package.on_test(function (api) {
   api.use('deps'); // try to use a core package
   api.add_files(['die-now.js'], 'server');
@@ -173,7 +177,7 @@ $METEOR test-packages -p $PORT >> $OUTPUT 2>&1 &
 
 METEOR_PID=$!
 
-sleep 2 # XXX XXX lame
+sleep 5 # XXX XXX lame
 
 ps ax | grep -e "$MONGOMARK" | grep -v grep >> $OUTPUT
 curl -s "http://localhost:$PORT" >> $OUTPUT
@@ -232,6 +236,10 @@ echo "... local-package-sets -- new package"
 
 mkdir -p "$TEST_TMPDIR/local-packages/a-package-named-bar/"
 cat > "$TEST_TMPDIR/local-packages/a-package-named-bar/package.js" <<EOF
+Package.describe({
+  summary: 'a-package-named-bar',
+  version: '1.0.0'
+});
 Npm.depends({gcd: '0.0.0'});
 
 Package.on_use(function(api) {
@@ -248,7 +256,7 @@ EOF
 
 ! $METEOR add a-package-named-bar >> $OUTPUT
 PACKAGE_DIRS="$TEST_TMPDIR/local-packages" $METEOR add a-package-named-bar >> $OUTPUT
-! $METEOR -p $PORT --once | grep "loaded a-package-named-bar" >> $OUTPUT
+$METEOR -p $PORT --once | grep "Cannot find anything about package -- a-package-named-bar" >> $OUTPUT
 PACKAGE_DIRS="$TEST_TMPDIR/local-packages" $METEOR -p $PORT --once | grep "loaded a-package-named-bar" >> $OUTPUT
 PACKAGE_DIRS="$TEST_TMPDIR/local-packages" $METEOR bundle $TEST_TMPDIR/bundle.tar.gz >> $OUTPUT
 tar tvzf $TEST_TMPDIR/bundle.tar.gz >>$OUTPUT
@@ -260,11 +268,21 @@ echo "... local-package-sets -- overridden package"
 mkdir -p "$TEST_TMPDIR/local-packages/accounts-ui/"
 cat > "$TEST_TMPDIR/local-packages/accounts-ui/package.js" <<EOF
 Package.describe({
-  summary: "accounts-ui - overridden"
+  summary: "accounts-ui - overridden",
+  version: "1.0.0"
 });
 
 EOF
 
+# Remove a-package-named-bar so that the local accounts-ui package is
+# the only thing that determines whether we need to set PACKAGE_DIRS. If
+# we were to leave a-package-named-bar in the app, then we would need to
+# specify PACKAGE_DIRS to get output from 'meteor list', even before
+# adding the local accounts-ui package, and we want to be able to run
+# 'meteor list' without PACKAGE_DIRS set to see that it picks up the
+# core accounts-ui package, not the local one.
+PACKAGE_DIRS="$TEST_TMPDIR/local-packages" $METEOR remove a-package-named-bar >> $OUTPUT
+
 ! $METEOR add accounts-ui 2>&1 | grep "accounts-ui - overridden" >> $OUTPUT
 $METEOR remove accounts-ui 2>&1 >> $OUTPUT
 PACKAGE_DIRS="$TEST_TMPDIR/local-packages" $METEOR add accounts-ui 2>&1 | grep "accounts-ui - overridden" >> $OUTPUT