summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoys Ollivier <lollivier@baylibre.com>2017-10-05 15:08:04 +0200
committerLoys Ollivier <lollivier@baylibre.com>2017-10-05 15:08:04 +0200
commit52dde34b4c54acabfe0a9a3f77b6869bc144f003 (patch)
tree9a04e3c2010720678c8e3efa1fedaf60168584e3
parent06c31d6239b59feb4337a7995edd771838fb2277 (diff)
Merge health tests into one
Merge the two health tests into one unique. Change-Id: I59f55d282338eee507d490e5d70d96c9b5023d37 Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
-rw-r--r--templates/tests/health-test.jinja224
-rw-r--r--templates/tests/test1.jinja221
-rw-r--r--templates/tests/test2.jinja222
3 files changed, 24 insertions, 43 deletions
diff --git a/templates/tests/health-test.jinja2 b/templates/tests/health-test.jinja2
new file mode 100644
index 0000000..3b01dfe
--- /dev/null
+++ b/templates/tests/health-test.jinja2
@@ -0,0 +1,24 @@
+- test:
+ timeout:
+ minutes: 2
+ definitions:
+ - repository:
+ metadata:
+ format: Lava-Test Test Definition 1.0
+ name: inline-test
+ description: "Inline test to validate test framewrok health"
+ os:
+ - debian
+ scope:
+ - functional
+ run:
+ steps:
+ - lava-test-set start set-pass
+ - lava-test-case always-pass --shell true
+ - lava-test-set stop set-pass
+ - lava-test-set start set-fail
+ - lava-test-case always-fail --shell false
+ - lava-test-set stop set-fail
+ from: inline
+ name: health-test
+ path: inline/health-test.yaml
diff --git a/templates/tests/test1.jinja2 b/templates/tests/test1.jinja2
deleted file mode 100644
index 8b04691..0000000
--- a/templates/tests/test1.jinja2
+++ /dev/null
@@ -1,21 +0,0 @@
-
-- test:
- timeout:
- minutes: 2
- definitions:
- - repository:
- metadata:
- format: Lava-Test Test Definition 1.0
- name: test1
- description: "test1"
- os:
- - debian
- scope:
- - functional
- run:
- steps:
- - lava-test-set start test1
- - lava-test-case always-pass --shell true
- from: inline
- name: dummytest1
- path: inline/test1.yaml
diff --git a/templates/tests/test2.jinja2 b/templates/tests/test2.jinja2
deleted file mode 100644
index 4dd4a14..0000000
--- a/templates/tests/test2.jinja2
+++ /dev/null
@@ -1,22 +0,0 @@
-
-- test:
- timeout:
- minutes: 2
- definitions:
- - repository:
- metadata:
- format: Lava-Test Test Definition 1.0
- name: test2
- description: "test2"
- os:
- - debian
- scope:
- - functional
- run:
- steps:
- - lava-test-set start test2
- - lava-test-case always-fail --shell false
- from: inline
- name: dummytest2
- path: inline/test2.yaml
-