From 5050df2747d7b586dae4890efbe670d2cf584eae Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 19 Apr 2017 17:55:44 +0300 Subject: Make challenge and fingerprint manifest values optional --- tests/manifest/result-request.test | 21 +++++++++++------ tests/manifest/task-request.test | 40 ++++++++++++++++++++------------- tests/manifest/task-response.test | 46 +++++++++++++++++++++++--------------- 3 files changed, 66 insertions(+), 41 deletions(-) (limited to 'tests/manifest') diff --git a/tests/manifest/result-request.test b/tests/manifest/result-request.test index 8cf64b9..3e1e08c 100644 --- a/tests/manifest/result-request.test +++ b/tests/manifest/result-request.test @@ -9,6 +9,8 @@ test.options += -rq : Roundtrip the result request manifest. : { + : all-values + : $* <>EOF : 1 session: abcd @@ -18,6 +20,18 @@ test.options += -rq version: 1.0 status: error EOF + + : no-challenge + : + $* <>EOF + : 1 + session: abcd + : + name: libfoo + version: 1.0 + status: error + EOF + } : redefinition @@ -75,13 +89,6 @@ EOI challenge: xyz EOI - : challenge - : - $* <'stdin:3:1: error: no result request challenge specified' == 1 - : 1 - session: abc - EOI - : result : $* <'stdin:4:1: error: result manifest expected' == 1 diff --git a/tests/manifest/task-request.test b/tests/manifest/task-request.test index 135dc8d..157b2ea 100644 --- a/tests/manifest/task-request.test +++ b/tests/manifest/task-request.test @@ -8,15 +8,30 @@ test.options += -tq : : Roundtrip the task request manifest. : -$* <>EOF -: 1 -agent: upsa -fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e -: -id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 -name: windows_10-msvc_14 -summary: Windows 10 build 1607 with VC 14 update 3 -EOF +{ + : all-values + : + $* <>EOF + : 1 + agent: upsa + fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e + : + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + EOF + + : no-fingerprint + : + $* <>EOF + : 1 + agent: upsa + : + id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + name: windows_10-msvc_14 + summary: Windows 10 build 1607 with VC 14 update 3 + EOF +} : redefinition : @@ -65,13 +80,6 @@ EOI : 1 fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e EOI - - : fingerprint - : - $* <'stdin:3:1: error: no task request fingerprint specified' == 1 - : 1 - agent: upsa - EOI } : no-machines diff --git a/tests/manifest/task-response.test b/tests/manifest/task-response.test index 22bdded..25a76f1 100644 --- a/tests/manifest/task-response.test +++ b/tests/manifest/task-response.test @@ -11,17 +11,34 @@ test.options += -ts { : session-not-empty : - $* <>EOF - : 1 - session: abcd - challenge: xyz - result-url: https://cppget.org/?build-result - : - name: libfoo - version: 1.0 - repository: http://pkg.example.org/1/math - machine: windows_10-msvc_14 - EOF + { + : all-values + : + $* <>EOF + : 1 + session: abcd + challenge: xyz + result-url: https://cppget.org/?build-result + : + name: libfoo + version: 1.0 + repository: http://pkg.example.org/1/math + machine: windows_10-msvc_14 + EOF + + : no-challenge + : + $* <>EOF + : 1 + session: abcd + result-url: https://cppget.org/?build-result + : + name: libfoo + version: 1.0 + repository: http://pkg.example.org/1/math + machine: windows_10-msvc_14 + EOF + } : session-empty : @@ -125,13 +142,6 @@ EOI : 1 EOI - : challenge - : - $* <'stdin:3:1: error: no task response challenge specified' == 1 - : 1 - session: abc - EOI - : result-url : $* <'stdin:4:1: error: no task response result url specified' == 1 -- cgit v1.1