From e19cedc4b45c190630ea622f2738786a1bbc10cb Mon Sep 17 00:00:00 2001
From: Zach Ramsay <zach.ramsay@gmail.com>
Date: Fri, 18 May 2018 12:03:57 -0400
Subject: [PATCH] tests: more smoothness

---
 .circleci/config.yml | 10 +++++-----
 Makefile             |  2 +-
 tests/test.sh        | 11 -----------
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100755 tests/test.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d147c6ac2..3ff0464e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,7 +46,7 @@ jobs:
           paths:
             - /go/src/github.com/tendermint/abci
 
-  test_integration:
+  test_apps:
     <<: *defaults
     steps:
       - attach_workspace:
@@ -56,10 +56,10 @@ jobs:
       - restore_cache:
           key: v1-tree-{{ .Environment.CIRCLE_SHA1 }}
       - run:
-          name: Run integration tests
+          name: Run apps tests
           command: |
             export PATH="$GOBIN:$PATH"
-            bash tests/test.sh
+            bash tests/test_app/test.sh
 
   test_cover:
     <<: *defaults
@@ -111,9 +111,9 @@ workflows:
       - test_cover:
           requires:
             - setup_dependencies
-      - test_integration:
+      - test_apps:
           requires:
             - setup_dependencies
       - upload_coverage:
           requires:
-            - test_integration
+            - test_cover
diff --git a/Makefile b/Makefile
index f44dc5e26..13a9547ce 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ test_race:
 test_cover:
 	@ bash tests/test_cover.sh
 
-test_app:
+test_apps:
 	# test the counter using a go test script
 	@ bash tests/test_app/test.sh
 
diff --git a/tests/test.sh b/tests/test.sh
deleted file mode 100755
index 416145fc9..000000000
--- a/tests/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-set -e
-
-# test the counter using a go test script
-bash tests/test_app/test.sh
-
-# test the cli against the examples in the tutorial at tendermint.com
-# TODO: make these less fragile
-# bash tests/test_cli/test.sh
-
-