From 98dc8bb90be0a1d6df6ce437fcf0c72590519058 Mon Sep 17 00:00:00 2001 From: Shrikant Sharat Date: Fri, 7 Mar 2014 11:07:19 +0530 Subject: [PATCH] git's output is so unreliable. We need a different way to check if git is doing what its supposed to do. --- tests/branch-bundle.t | 12 ++---------- tests/bundle.t | 10 ++-------- tests/bundles.t | 16 ++-------------- tests/cleanup.t | 10 ++-------- tests/list.t | 10 ++-------- tests/no_local_clone.t | 5 +---- tests/revert-update.t | 5 +---- tests/selfupdate.t | 10 ++-------- tests/snapshots.t | 10 ++-------- tests/theme.t | 5 +---- tests/update.t | 5 +---- 11 files changed, 18 insertions(+), 80 deletions(-) diff --git a/tests/branch-bundle.t b/tests/branch-bundle.t index 6d0b507..12deca1 100644 --- a/tests/branch-bundle.t +++ b/tests/branch-bundle.t @@ -17,12 +17,7 @@ Go back to master. Load plugin from b1. - $ antigen-bundle $PLUGIN_DIR --branch=b1 - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done - Switched to a new branch 'b1' - Branch b1 set up to track remote branch b1 from origin. + $ antigen-bundle $PLUGIN_DIR --branch=b1 &> /dev/null $ hehe hehe from b1 @@ -32,9 +27,6 @@ Does not say 'Already on b1' on each session startup. Load plugin from master. - $ antigen-bundle $PLUGIN_DIR - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null $ hehe hehe diff --git a/tests/bundle.t b/tests/bundle.t index 145dc8f..3a69b95 100644 --- a/tests/bundle.t +++ b/tests/bundle.t @@ -1,9 +1,6 @@ Load plugin from master. - $ antigen-bundle $PLUGIN_DIR - Cloning into '*'... (glob) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null $ hehe hehe @@ -21,10 +18,7 @@ Confirm there is still only one repository. Load a prezto style module. Should only source the `init.zsh` present in the module. - $ antigen-bundle $PLUGIN_DIR2 - Cloning into '*'... (glob) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR2 &> /dev/null $ hehe2 hehe2 diff --git a/tests/bundles.t b/tests/bundles.t index 5ec2456..696cc6f 100644 --- a/tests/bundles.t +++ b/tests/bundles.t @@ -1,12 +1,6 @@ Add multiple bundles. - $ echo "$PLUGIN_DIR\n$PLUGIN_DIR2" | antigen-bundles - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done + $ echo "$PLUGIN_DIR\n$PLUGIN_DIR2" | antigen-bundles &> /dev/null Check if they are both applied. @@ -22,13 +16,7 @@ Clean it all up. Specify with indentation. - $ echo " $PLUGIN_DIR\n $PLUGIN_DIR2" | antigen-bundles - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done + $ echo " $PLUGIN_DIR\n $PLUGIN_DIR2" | antigen-bundles &> /dev/null Again, check if they are both applied. diff --git a/tests/cleanup.t b/tests/cleanup.t index f975f8d..d53dc7a 100644 --- a/tests/cleanup.t +++ b/tests/cleanup.t @@ -5,14 +5,8 @@ Firstly, no plugins, nothing to cleanup. Load the plugins. - $ antigen-bundle $PLUGIN_DIR - Cloning into '*'... (glob) - done. - Checking connectivity... done - $ antigen-bundle $PLUGIN_DIR2 - Cloning into '*'... (glob) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null + $ antigen-bundle $PLUGIN_DIR2 &> /dev/null Check the listing. diff --git a/tests/list.t b/tests/list.t index 4db8a0e..7b8af1e 100644 --- a/tests/list.t +++ b/tests/list.t @@ -6,10 +6,7 @@ Empty initial listing. Add a bundle. - $ antigen-bundle $PLUGIN_DIR - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null $ antigen-list */test-plugin / plugin true (glob) @@ -21,10 +18,7 @@ Add same bundle and check uniqueness. Add another bundle. - $ antigen-bundle $PLUGIN_DIR2 - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR2 &> /dev/null $ antigen-list */test-plugin / plugin true (glob) */test-plugin2 / plugin true (glob) diff --git a/tests/no_local_clone.t b/tests/no_local_clone.t index 299675a..8ec41d8 100644 --- a/tests/no_local_clone.t +++ b/tests/no_local_clone.t @@ -14,10 +14,7 @@ Confirm no clone is made. Load the plugin with a clone. - $ antigen-bundle $PLUGIN_DIR - Cloning into '*'... (glob) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null Empty the record. diff --git a/tests/revert-update.t b/tests/revert-update.t index 93ee45e..f4763bc 100644 --- a/tests/revert-update.t +++ b/tests/revert-update.t @@ -1,9 +1,6 @@ Load and test plugin. - $ antigen-bundle $PLUGIN_DIR - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null $ hehe hehe diff --git a/tests/selfupdate.t b/tests/selfupdate.t index 6e46942..b8fc970 100644 --- a/tests/selfupdate.t +++ b/tests/selfupdate.t @@ -20,10 +20,7 @@ Create fake host repository Create a normal repository cloning from host - $ git clone $TEST_HOST $TEST_NORMAL - Cloning into * (glob) - done. - Checking connectivity... done + $ git clone $TEST_HOST $TEST_NORMAL &> /dev/null Create a submodule repository cloning from host @@ -31,10 +28,7 @@ Create a submodule repository cloning from host $ cd $TEST_SUBMODULE $ git init Initialized empty Git repository in * (glob) - $ git submodule add $TEST_HOST antigen - Cloning into 'antigen'... - done. - Checking connectivity... done + $ git submodule add $TEST_HOST antigen &> /dev/null $ git commit -m "1" [master (root-commit) ???????] 1 (glob) 2 files changed, 4 insertions(+) diff --git a/tests/snapshots.t b/tests/snapshots.t index 9be2452..2bb066b 100644 --- a/tests/snapshots.t +++ b/tests/snapshots.t @@ -1,13 +1,7 @@ Load a couple of plugins. - $ antigen-bundle $PLUGIN_DIR - Cloning into '*'... (glob) - done. - Checking connectivity... done - $ antigen-bundle $PLUGIN_DIR2 - Cloning into '*'... (glob) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null + $ antigen-bundle $PLUGIN_DIR2 &> /dev/null Create a snapshot file. diff --git a/tests/theme.t b/tests/theme.t index 723376a..dfdc6d2 100644 --- a/tests/theme.t +++ b/tests/theme.t @@ -1,8 +1,5 @@ Load the theme explicitly. - $ antigen-theme $PLUGIN_DIR silly - Cloning into '*'... (glob) - done. - Checking connectivity... done + $ antigen-theme $PLUGIN_DIR silly &> /dev/null $ echo "$PS1" prompt> diff --git a/tests/update.t b/tests/update.t index 6a2f5f2..df94b04 100644 --- a/tests/update.t +++ b/tests/update.t @@ -1,9 +1,6 @@ Load plugin. - $ antigen-bundle $PLUGIN_DIR - Cloning into '.+?'\.\.\. (re) - done. - Checking connectivity... done + $ antigen-bundle $PLUGIN_DIR &> /dev/null $ hehe hehe -- 2.0.0