From 7ec5a2ef1ac80d2a3b1715e75ac4e507330de4e6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 15 Mar 2021 22:02:40 +0300
Subject: Add support for interactive-{mode,login} task request and interactive
 task manifest values

---
 tests/manifest/task-request.testscript  | 64 +++++++++++++++++++++++++++++++++
 tests/manifest/task-response.testscript |  1 +
 tests/manifest/task.testscript          | 16 +++++++++
 3 files changed, 81 insertions(+)

(limited to 'tests/manifest')

diff --git a/tests/manifest/task-request.testscript b/tests/manifest/task-request.testscript
index 4b797f6..cee21fb 100644
--- a/tests/manifest/task-request.testscript
+++ b/tests/manifest/task-request.testscript
@@ -15,6 +15,8 @@ test.options += -tq
   agent: upsa
   toolchain-name: queue
   toolchain-version: 0.5.0
+  interactive-mode: both
+  interactive-login: 10.5.0.1:5901
   fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e
   :
   id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
@@ -124,3 +126,65 @@ toolchain-name: queue
 toolchain-version: 0.5.0
 fingerprint: 1105fb394ee870adb154b7abfbbae5755df7dcef6c81db34e8d1b68d2653734e
 EOI
+
+: interactive
+:
+{
+  : redefinition
+  :
+  {
+    : mode
+    :
+    $* <<EOI 2>'stdin:3:1: error: task request interactive mode redefinition' == 1
+      : 1
+      interactive-mode: true
+      interactive-mode: both
+      EOI
+
+    : login
+    :
+    $* <<EOI 2>'stdin:3:1: error: task request interactive login redefinition' == 1
+      : 1
+      interactive-login: 10.5.0.1:5901
+      interactive-login: 10.5.0.1:5901
+      EOI
+  }
+
+  : invalid
+  :
+  {
+    : mode
+    :
+    $* <<EOI 2>'stdin:2:19: error: invalid task request interactive mode' == 1
+      : 1
+      interactive-mode: on
+      EOI
+
+    : login
+    :
+    $* <<EOI 2>'stdin:2:19: error: empty task request interactive login' == 1
+      : 1
+      interactive-login:
+      EOI
+  }
+
+  : no-login
+  :
+  $* <<EOI 2>'stdin:6:1: error: no task request interactive login specified' == 1
+    : 1
+    agent: upsa
+    toolchain-name: queue
+    toolchain-version: 0.5.0
+    interactive-mode: both
+    EOI
+
+  : unexpected-login
+  :
+  $* <<EOI 2>'stdin:5:1: error: interactive login specified for non-interactive mode' == 1
+    : 1
+    agent: upsa
+    toolchain-name: queue
+    toolchain-version: 0.5.0
+    interactive-login: 10.5.0.1:5901
+    EOI
+}
diff --git a/tests/manifest/task-response.testscript b/tests/manifest/task-response.testscript
index e7dbdb9..d486dda 100644
--- a/tests/manifest/task-response.testscript
+++ b/tests/manifest/task-response.testscript
@@ -80,6 +80,7 @@ test.options += -ts
 : invalid
 :
 {
+
   : challenge
   :
   {
diff --git a/tests/manifest/task.testscript b/tests/manifest/task.testscript
index 65ecd29..b5ca66a 100644
--- a/tests/manifest/task.testscript
+++ b/tests/manifest/task.testscript
@@ -24,6 +24,7 @@ test.options += -t
   environment: lld
   config: config.cc.coptions=/Z7 config.cc.loptions=/DEBUG
   warning-regex: '^warning: ' '^.+: warning: '
+  interactive: error
   EOF
 
   : no-config-regex-environment
@@ -167,6 +168,14 @@ test.options += -t
   warning-regex: '^warning: '
   warning-regex: '^.+: warning: '
   EOI
+
+  : interactive
+  :
+  $* <<EOI 2>'stdin:3:1: error: task interactive value redefinition' == 1
+  : 1
+  interactive: error
+  interactive: warning
+  EOI
 }
 
 : invalid
@@ -326,6 +335,13 @@ test.options += -t
   : 1
   trust: abc
   EOI
+
+  : interactive
+  :
+  $* <<EOI 2>'stdin:2:13: error: empty task interactive value' == 1
+  : 1
+  interactive:
+  EOI
 }
 
 : unknown-name
-- 
cgit v1.1