From 049692d68ea360f9156ed8f71720fbe3756ab736 Mon Sep 17 00:00:00 2001 From: "Joshua B. Bussdieker" Date: Thu, 3 Apr 2014 21:00:17 -0700 Subject: [PATCH] Fix test ordering and default to empty install --- .travis.yml | 1 - tests/00gvm_install_comment_test.sh | 15 +++++++++++++++ tests/gvm_install_comment_test.sh | 4 ---- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 tests/00gvm_install_comment_test.sh delete mode 100644 tests/gvm_install_comment_test.sh diff --git a/.travis.yml b/.travis.yml index 2155abe..b0e2517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,5 @@ os: [linux, osx] osx_image: mavericks before_install: - "binscripts/gvm-installer $TRAVIS_COMMIT $TRAVIS_BUILD_DIR/tmp" - - "source $TRAVIS_BUILD_DIR/tmp/gvm/scripts/gvm; gvm install tip" install: gem install tf -v '>=0.4.1' script: source $TRAVIS_BUILD_DIR/tmp/gvm/scripts/gvm; tf --text tests/* diff --git a/tests/00gvm_install_comment_test.sh b/tests/00gvm_install_comment_test.sh new file mode 100644 index 0000000..b07cee2 --- /dev/null +++ b/tests/00gvm_install_comment_test.sh @@ -0,0 +1,15 @@ +## Cleanup test objects +gvm uninstall tip > /dev/null 2>&1 +gvm uninstall go1.0.3 > /dev/null 2>&1 +gvm uninstall go1.1.1 > /dev/null 2>&1 +gvm uninstall go1.2 > /dev/null 2>&1 +####################### + +gvm install tip #status=0 +gvm list #status=0; match=/tip/ +gvm install go1.0.3 #status=0 +gvm list #status=0; match=/go1.0.3/ +gvm install go1.1.1 #status=0 +gvm list #status=0; match=/go1.1.1/ +gvm install go1.2 #status=0 +gvm list #status=0; match=/go1.2/ diff --git a/tests/gvm_install_comment_test.sh b/tests/gvm_install_comment_test.sh deleted file mode 100644 index a93c675..0000000 --- a/tests/gvm_install_comment_test.sh +++ /dev/null @@ -1,4 +0,0 @@ -gvm install tip #status=0 -gvm install go1.0.3 #status=0 -gvm install go1.1.1 #status=0 -gvm install go1.2 #status=0