From 4de6dec28848ca7b61c17bab10360e0be3c1a267 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Fri, 12 Jul 2013 20:08:44 +0100 Subject: [PATCH] Remove unused recreate-db options from run_test.sh run_tests.sh had an option to delete tests.sqlite, but that file is not used anymore so the run_test options don't do anything. Change-Id: I1abb257579da34c9dd7698543d8297268276bbc5 --- doc/source/devref/unit_tests.rst | 2 -- run_tests.sh | 9 --------- 2 files changed, 11 deletions(-) diff --git a/doc/source/devref/unit_tests.rst b/doc/source/devref/unit_tests.rst index b6549bd00..d4fa83896 100644 --- a/doc/source/devref/unit_tests.rst +++ b/doc/source/devref/unit_tests.rst @@ -33,8 +33,6 @@ This will show the following help information:: -V, --virtual-env Always use virtualenv. Install automatically if not present -N, --no-virtual-env Don't use virtualenv. Run tests in local environment -s, --no-site-packages Isolate the virtualenv from the global Python environment - -r, --recreate-db Recreate the test database (deprecated, as this is now the default). - -n, --no-recreate-db Don't recreate the test database. -x, --stop Stop running tests after the first error or failure. -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added. -p, --pep8 Just run pep8 diff --git a/run_tests.sh b/run_tests.sh index c8513749f..ea4872786 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -9,8 +9,6 @@ function usage { echo " -V, --virtual-env Always use virtualenv. Install automatically if not present" echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment" echo " -s, --no-site-packages Isolate the virtualenv from the global Python environment" - echo " -r, --recreate-db Recreate the test database (deprecated, as this is now the default)." - echo " -n, --no-recreate-db Don't recreate the test database." echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added." echo " -u, --update Update the virtual environment with any newer package versions" echo " -p, --pep8 Just run PEP8 and HACKING compliance check" @@ -40,8 +38,6 @@ function process_options { -V|--virtual-env) always_venv=1; never_venv=0;; -N|--no-virtual-env) always_venv=0; never_venv=1;; -s|--no-site-packages) no_site_packages=1;; - -r|--recreate-db) recreate_db=1;; - -n|--no-recreate-db) recreate_db=0;; -f|--force) force=1;; -u|--update) update=1;; -p|--pep8) just_pep8=1;; @@ -83,7 +79,6 @@ just_pep8=0 no_pep8=0 coverage=0 debug=0 -recreate_db=1 update=0 LANG=en_US.UTF-8 @@ -219,10 +214,6 @@ if [ $just_pep8 -eq 1 ]; then exit fi -if [ $recreate_db -eq 1 ]; then - rm -f tests.sqlite -fi - init_testr run_tests