From ec648ea7536e05d6e681c3614f0acb39c31bb344 Mon Sep 17 00:00:00 2001 From: sneakypete81 Date: Sun, 1 Sep 2013 18:10:24 +0100 Subject: [PATCH] Added HTTPS functional tests --- run_functional_tests | 9 +++++++++ tests/functional/README.markdown | 9 +++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/run_functional_tests b/run_functional_tests index ee3c8fa..c918073 100755 --- a/run_functional_tests +++ b/run_functional_tests @@ -42,3 +42,12 @@ export TROVEBOX_TEST_CONFIG=test-hosted unset TROVEBOX_TEST_SERVER_API python -m unittest discover --catch tests/functional +# Test account on hosted trovebox.com site over HTTPS +tput setaf 3 +echo +echo "Testing latest hosted site over HTTPS..." +tput sgr0 +export TROVEBOX_TEST_CONFIG=test-hosted-https +unset TROVEBOX_TEST_SERVER_API +python -m unittest discover --catch tests/functional + diff --git a/tests/functional/README.markdown b/tests/functional/README.markdown index 5a22abc..6a20718 100644 --- a/tests/functional/README.markdown +++ b/tests/functional/README.markdown @@ -99,7 +99,8 @@ all supported API versions. To use it, you must set up multiple Trovebox instances and create the following config files containing your credentials: - test : Latest self-hosted site (from photo/frontend master branch) - test-apiv1 : APIv1 self-hosted site (from photo/frontend commit 660b2ab) - test-3.0.8 : v3.0.8 self-hosted site (from photo/frontend commit e9d81de57b) - test-hosted : Credentials for test account on trovebox.com + test : Latest self-hosted site (from photo/frontend master branch) + test-apiv1 : APIv1 self-hosted site (from photo/frontend commit 660b2ab) + test-3.0.8 : v3.0.8 self-hosted site (from photo/frontend commit e9d81de57b) + test-hosted : Credentials for test account on http://.trovebox.com + test-hosted-https : Same as test-hosted, but with https://