From 76f7eb2e4a359a7c978efa19fdf71fe1ea46b971 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 19 Jan 2015 09:55:59 -0500 Subject: Tests: Extend RunCMake.CTestSubmit test to cover 'drop' failures Replace the TODO comment with calls to run_ctest_submit_FailDrop. For now leave curl errors out of expected stderr. They can be ported over from CTestTestFailedSubmit-* tests later. --- Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt | 4 ++++ Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt | 3 +++ Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt | 3 +++ Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt | 3 +++ Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt | 3 +++ Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt | 3 +++ Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt | 3 +++ Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt | 2 ++ Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt | 1 + Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt | 2 ++ Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt | 1 + Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake | 7 ++++++- 19 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt new file mode 100644 index 0000000..b451315 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt @@ -0,0 +1,4 @@ +Missing arguments for submit via cp: +.* + Problems when submitting via CP +Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-cp/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt new file mode 100644 index 0000000..fa6e004 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt @@ -0,0 +1 @@ +Submit files \(using cp\) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt new file mode 100644 index 0000000..a622fac --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt @@ -0,0 +1,3 @@ +Error message was: .* + Problems when submitting via FTP +Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-ftp/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt new file mode 100644 index 0000000..345bb62 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt @@ -0,0 +1,3 @@ +Submit files \(using ftp\) + Using FTP submit method + Drop site: ftp:// diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt new file mode 100644 index 0000000..6870d2e --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt @@ -0,0 +1,3 @@ +Error message was: .* + Problems when submitting via HTTP +Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-http/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt new file mode 100644 index 0000000..c7f35c5 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt @@ -0,0 +1,3 @@ +Submit files \(using http\) + Using HTTP submit method + Drop site:http:// diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt new file mode 100644 index 0000000..a3c0cd5 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt @@ -0,0 +1,3 @@ +Error message was: .* + Problems when submitting via HTTP +Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-https/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt new file mode 100644 index 0000000..19f8234 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt @@ -0,0 +1,3 @@ +Submit files \(using https\) + Using HTTP submit method + Drop site:https:// diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt new file mode 100644 index 0000000..42b8f50 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt @@ -0,0 +1,2 @@ + Problems when submitting via SCP +Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-scp/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt new file mode 100644 index 0000000..ec2ce92 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt @@ -0,0 +1 @@ +Submit files \(using scp\) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt new file mode 100644 index 0000000..b57e2de --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt @@ -0,0 +1 @@ +(-1|255) diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt new file mode 100644 index 0000000..020b615 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt @@ -0,0 +1,2 @@ + (Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!) +Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc/test.cmake diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt new file mode 100644 index 0000000..ed2acb5 --- /dev/null +++ b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt @@ -0,0 +1 @@ +Submit files \(using xmlrpc\) diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake index 6f18563..7cab3f3 100644 --- a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake @@ -40,4 +40,9 @@ function(run_ctest_submit_FailDrop CASE_DROP_METHOD) run_ctest(FailDrop-${CASE_DROP_METHOD}) endfunction() -# TODO: call run_ctest_submit_FailDrop() for each submission protocol +run_ctest_submit_FailDrop(cp) +run_ctest_submit_FailDrop(ftp) +run_ctest_submit_FailDrop(http) +run_ctest_submit_FailDrop(https) +run_ctest_submit_FailDrop(scp) +run_ctest_submit_FailDrop(xmlrpc) -- cgit v0.12 From ef97cd8587e7f8d4017b18147aaaca0ec5cb9f0c Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 20 Jan 2015 10:11:39 -0500 Subject: Tests: Fix obscure RunCMake.CTestSubmit 'drop' case failures When curl is given a URL of the form '://' it tries to resolve '' as a host name. If the host happens to exist and have a server then the drop might actually appear to work. Instead use an explicit '-no-site-' host to ensure it cannot connect. Reported-by: Gilles Khouzam --- Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in | 1 + Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in b/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in index f0e1653..378a85a 100644 --- a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in +++ b/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in @@ -3,3 +3,4 @@ set(CTEST_PROJECT_NAME "CTestSubmit@CASE_NAME@") # Intentionally leave out other upload-related CTestConfig.cmake settings # so that any ctest_submit calls fail with an error message. set(CTEST_DROP_METHOD "@CASE_DROP_METHOD@") +set(CTEST_DROP_SITE "@CASE_DROP_SITE@") diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake index 7cab3f3..3638007 100644 --- a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake @@ -2,6 +2,7 @@ include(RunCMake) # Default case parameters. set(CASE_DROP_METHOD "http") +set(CASE_DROP_SITE "-no-site-") set(CASE_CTEST_SUBMIT_ARGS "") function(run_ctest CASE_NAME) -- cgit v0.12