From 3686a49cf8b3867fbcf74e03efdbd7993c9582d7 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 20 Jun 2016 15:56:45 -0700
Subject: [PATCH] test-devserver.sh is replaced by scripts/test-localhost.sh.

Also, update the README instructions for how to push changes upstream.
---
 README.md         | 15 +++-----------
 test-devserver.sh | 52 -----------------------------------------------
 2 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100755 test-devserver.sh

diff --git a/README.md b/README.md
index 16dcc012be6..41f39c7a02b 100644
--- a/README.md
+++ b/README.md
@@ -135,18 +135,9 @@ The first time using the `subtree` command, we may need to use the `--rejoin`
 argument.
 
 ```
-git subtree split --prefix=java-repo-tools -b java-repo-tools-update-from-java-docs-samples
-git checkout java-repo-tools-update-from-java-docs-samples
-git push java-repo-tools java-repo-tools-update-from-java-docs-samples
-```
-
-After you have committed all the changes you want to your `java-repo-tools`
-branch, you can push to the upstream `java-repo-tools` repository with the
-following command. (Replace `name-for-remote-branch` with the name you'd like to
-give the branch on the `java-repo-tools` repository.)
-
-```
-git push java-repo-tools java-repo-tools:name-for-remote-branch
+git subtree split --prefix=java-repo-tools -b ${USER}-push-java-repo-tools
+git checkout ${USER}-push-java-repo-tools
+git push java-repo-tools ${USER}-push-java-repo-tools
 ```
 
 Then, you can send a pull request to the `java-repo-tools` repository.
diff --git a/test-devserver.sh b/test-devserver.sh
deleted file mode 100755
index 62b3dfefef7..00000000000
--- a/test-devserver.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Usage:
-#     test-devserver.sh path/to/project
-#
-# This script runs the local appengine:devserver Maven plugin and verifies that
-# a request to http://localhost:8080/ does not return an error code.
-#
-# As an example, this is useful for verifying that datastore-indexes.xml is
-# correct (only if autoGenerate=false and the / handler does all queries used),
-# as an example.
-
-set -e
-set -x
-
-if [ -z "$1" ]; then
-  echo "Missing directory parameter."
-  echo "Usage:"
-  echo "  $0 path/to/project"
-  exit 1
-fi
-
-(
-cd "$1"
-expect -c '
-    spawn mvn --batch-mode clean appengine:devserver -DskipTests
-    set timeout 600
-    expect localhost:8080
-    sleep 10
-    spawn curl --silent --output /dev/stderr --write-out "%{http_code}" http://localhost:8080/
-    expect {
-      "200" {
-        exit
-      }
-    }
-    exit 1
-    '
-)
-