Skip to contentSkip to conversation

Add test cases for commands of vixie-cron.

PATCH Superseded Wang Mingyu 2 participants 3 messages Oct 31, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add test cases for commands of vixie-cron.

---
 engine/tests/Functional.vixie-cron/data/cronentry  |  1 +
 engine/tests/Functional.vixie-cron/data/crontab    | 11 ++++
 .../Functional.vixie-cron/data/crontab.logger      | 12 ++++
 engine/tests/Functional.vixie-cron/fuego_test.sh   | 22 +++++++
 engine/tests/Functional.vixie-cron/parser.py       | 22 +++++++
 engine/tests/Functional.vixie-cron/spec.json       |  7 +++
 .../tests/vixie-cron_crond01.sh                    | 53 ++++++++++++++++
 .../tests/vixie-cron_crond02.sh                    | 52 ++++++++++++++++
 .../tests/vixie-cron_crond03.sh                    | 56 +++++++++++++++++
 .../tests/vixie-cron_crond04.sh                    | 56 +++++++++++++++++
 .../tests/vixie-cron_crontab01.sh                  | 55 +++++++++++++++++
 .../tests/vixie-cron_crontab02.sh                  | 71 ++++++++++++++++++++++
 .../tests/Functional.vixie-cron/vixie-cron_test.sh |  4 ++
 13 files changed, 422 insertions(+)
 create mode 100644 engine/tests/Functional.vixie-cron/data/cronentry
 create mode 100644 engine/tests/Functional.vixie-cron/data/crontab
 create mode 100644 engine/tests/Functional.vixie-cron/data/crontab.logger
 create mode 100644 engine/tests/Functional.vixie-cron/fuego_test.sh
 create mode 100644 engine/tests/Functional.vixie-cron/parser.py
 create mode 100644 engine/tests/Functional.vixie-cron/spec.json
 create mode 100644 engine/tests/Functional.vixie-cron/tests/vixie-cron_crond01.sh
 create mode 100644 engine/tests/Functional.vixie-cron/tests/vixie-cron_crond02.sh
 create mode 100644 engine/tests/Functional.vixie-cron/tests/vixie-cron_crond03.sh
 create mode 100644 engine/tests/Functional.vixie-cron/tests/vixie-cron_crond04.sh
 create mode 100644 engine/tests/Functional.vixie-cron/tests/vixie-cron_crontab01.sh
 create mode 100644 engine/tests/Functional.vixie-cron/tests/vixie-cron_crontab02.sh
 create mode 100755 engine/tests/Functional.vixie-cron/vixie-cron_test.sh
engine/tests/Functional.vixie-cron/data/cronentry new file +1 -0
new file mode 100644
index 0000000..247919e
@@ -0,0 +1 @@
+0-59/1 * * * * /usr/bin/logger -i -t TEST -p kern.warning "TEST Message2"
engine/tests/Functional.vixie-cron/data/crontab new file +11 -0
new file mode 100644
index 0000000..1023aa8
@@ -0,0 +1,11 @@
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+MAILTO=root
+HOME=/
+
+# run-parts
+01 * * * * root run-parts /etc/cron.hourly
+02 4 * * * root run-parts /etc/cron.daily
+22 4 * * 0 root run-parts /etc/cron.weekly
+42 4 1 * * root run-parts /etc/cron.monthly
+
engine/tests/Functional.vixie-cron/data/crontab.logger new file +12 -0
new file mode 100644
index 0000000..4dea00d
@@ -0,0 +1,12 @@
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+MAILTO=root
+HOME=/
+
+# run-parts
+01 * * * * root run-parts /etc/cron.hourly
+02 4 * * * root run-parts /etc/cron.daily
+22 4 * * 0 root run-parts /etc/cron.weekly
+42 4 1 * * root run-parts /etc/cron.monthly
+0-59/1 * * * * root /usr/bin/logger -i -t TEST -p kern.warning "TEST Message crond"
+
engine/tests/Functional.vixie-cron/fuego_test.sh new file +22 -0
new file mode 100644
index 0000000..f9f7d25
@@ -0,0 +1,22 @@
+function test_pre_check {
+    is_on_target_path crond PROGRAM_CROND
+    assert_define PROGRAM_CROND "Missing 'crond' program on target board"
+    is_on_target_path crontab PROGRAM_CRONTAB
+    assert_define PROGRAM_CRONTAB "Missing 'crontab' program on target board"
+}
+
+function test_deploy {
+    put $TEST_HOME/vixie-cron_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+    put $FUEGO_CORE/engine/scripts/fuego_board_function_lib.sh $BOARD_TESTDIR/fuego.$TESTDIR
+    put -r $TEST_HOME/tests $BOARD_TESTDIR/fuego.$TESTDIR/
+    put -r $TEST_HOME/data $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+    report "cd $BOARD_TESTDIR/fuego.$TESTDIR;\
+    ./vixie-cron_test.sh"
+}
+
+function test_processing {
+    log_compare "$TESTDIR" "0" "TEST-FAIL" "n"
+}
engine/tests/Functional.vixie-cron/parser.py new file +22 -0
new file mode 100644
index 0000000..d85abd7
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# See common.py for description of command-line arguments
+
+import os, sys, collections
+
+sys.path.insert(0, os.environ['FUEGO_CORE'] + '/engine/scripts/parser')
+import common as plib
+
+measurements = {}
+measurements = collections.OrderedDict()
+
+regex_string = '^ -> (.*): TEST-(.*)$'
+matches = plib.parse_log(regex_string)
+
+if matches:
+    for m in matches:
+        measurements['default.' + m[0]] = 'PASS' if m[1] == 'PASS' else 'FAIL'
+
+# split the output for each testcase
+plib.split_output_per_testcase(regex_string, measurements)
+
+sys.exit(plib.process(measurements))
engine/tests/Functional.vixie-cron/spec.json new file +7 -0
new file mode 100644
index 0000000..deb29de
@@ -0,0 +1,7 @@
+{
+    "testName": "Functional.vixie-cron",
+    "specs": {
+        "default": {}
+    }
+}
+
engine/tests/Functional.vixie-cron/tests/vixie-cron_crond01.sh new file +53 -0

53 lines not on this page · raw message

engine/tests/Functional.vixie-cron/tests/vixie-cron_crond02.sh new file +52 -0

52 lines not on this page · raw message

engine/tests/Functional.vixie-cron/tests/vixie-cron_crond03.sh new file +56 -0

56 lines not on this page · raw message

engine/tests/Functional.vixie-cron/tests/vixie-cron_crond04.sh new file +56 -0

56 lines not on this page · raw message

engine/tests/Functional.vixie-cron/tests/vixie-cron_crontab01.sh new file +55 -0

55 lines not on this page · raw message

engine/tests/Functional.vixie-cron/tests/vixie-cron_crontab02.sh new file +71 -0

71 lines not on this page · raw message

engine/tests/Functional.vixie-cron/vixie-cron_test.sh new file +4 -0
new file mode 100755
index 0000000..dd5ce37
@@ -0,0 +1,4 @@
+#!/bin/sh
+for i in tests/*.sh; do
+    sh $i
+done
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 Add test cases of command tcsd.

---
 engine/tests/Functional.trousers/fuego_test.sh     | 19 +++++++++++++++++++
 engine/tests/Functional.trousers/parser.py         | 22 ++++++++++++++++++++++
 engine/tests/Functional.trousers/spec.json         |  7 +++++++
 .../Functional.trousers/tests/trousers_help.sh     | 16 ++++++++++++++++
 .../Functional.trousers/tests/trousers_start.sh    | 18 ++++++++++++++++++
 engine/tests/Functional.trousers/trousers_test.sh  |  4 ++++
 6 files changed, 86 insertions(+)
 create mode 100644 engine/tests/Functional.trousers/fuego_test.sh
 create mode 100644 engine/tests/Functional.trousers/parser.py
 create mode 100644 engine/tests/Functional.trousers/spec.json
 create mode 100644 engine/tests/Functional.trousers/tests/trousers_help.sh
 create mode 100644 engine/tests/Functional.trousers/tests/trousers_start.sh
 create mode 100755 engine/tests/Functional.trousers/trousers_test.sh
engine/tests/Functional.trousers/fuego_test.sh new file +19 -0
new file mode 100644
index 0000000..25b68cd
@@ -0,0 +1,19 @@
+function test_pre_check {
+    is_on_target_path tcsd PROGRAM_TCSD
+    assert_define PROGRAM_TCSD "Missing 'tcsd' program on target board"
+}
+
+function test_deploy {
+    put $TEST_HOME/trousers_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+    put $FUEGO_CORE/engine/scripts/fuego_board_function_lib.sh $BOARD_TESTDIR/fuego.$TESTDIR
+    put -r $TEST_HOME/tests $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+    report "cd $BOARD_TESTDIR/fuego.$TESTDIR;\
+    ./trousers_test.sh"
+}
+
+function test_processing {
+    log_compare "$TESTDIR" "0" "TEST-FAIL" "n"
+}
engine/tests/Functional.trousers/parser.py new file +22 -0
new file mode 100644
index 0000000..d85abd7
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# See common.py for description of command-line arguments
+
+import os, sys, collections
+
+sys.path.insert(0, os.environ['FUEGO_CORE'] + '/engine/scripts/parser')
+import common as plib
+
+measurements = {}
+measurements = collections.OrderedDict()
+
+regex_string = '^ -> (.*): TEST-(.*)$'
+matches = plib.parse_log(regex_string)
+
+if matches:
+    for m in matches:
+        measurements['default.' + m[0]] = 'PASS' if m[1] == 'PASS' else 'FAIL'
+
+# split the output for each testcase
+plib.split_output_per_testcase(regex_string, measurements)
+
+sys.exit(plib.process(measurements))
engine/tests/Functional.trousers/spec.json new file +7 -0
new file mode 100644
index 0000000..668c438
@@ -0,0 +1,7 @@
+{
+    "testName": "Functional.trousers",
+    "specs": {
+        "default": {}
+    }
+}
+
engine/tests/Functional.trousers/tests/trousers_help.sh new file +16 -0
new file mode 100644
index 0000000..6d9bf4b
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+#  In target, run command tcsd.
+#  option: -h
+
+test="help"
+
+expect <<-EOF
+spawn tcsd --help
+expect {
+ "usage:" {
+           send_user " -> $test: TEST-PASS\n"
+          }
+ default { send_user " -> $test: TEST-FAIL\n" }
+}
+EOF
engine/tests/Functional.trousers/tests/trousers_start.sh new file +18 -0
new file mode 100644
index 0000000..d85c532
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+#  In target, start the service tcsd.
+
+test="start"
+
+. ./fuego_board_function_lib.sh
+
+set_init_manager
+
+exec_service_on_target tcsd stop
+
+if exec_service_on_target tcsd start
+then
+    echo " -> $test: TEST-PASS"
+else
+    echo " -> $test: TEST-FAIL"
+fi
engine/tests/Functional.trousers/trousers_test.sh new file +4 -0
new file mode 100755
index 0000000..dd5ce37
@@ -0,0 +1,4 @@
+#!/bin/sh
+for i in tests/*.sh; do
+    sh $i
+done
Signature · 1 line
1.8.3.1
#2 lore raw

Re: [Fuego] [PATCH] Add test cases of command tcsd.

Please see comments inline below.

Quoted 2 lines

-----Original Message-----
From: Wang Mingyu on Wednesday, October 31, 2018 1:45 AM

Please add something to the commit message. It would be good to describe what 'trousers' is, and what this test actually does.

Quoted 28 lines
---
 engine/tests/Functional.trousers/fuego_test.sh     | 19
+++++++++++++++++++
 engine/tests/Functional.trousers/parser.py         | 22
++++++++++++++++++++++
 engine/tests/Functional.trousers/spec.json         |  7 +++++++
 .../Functional.trousers/tests/trousers_help.sh     | 16 ++++++++++++++++
 .../Functional.trousers/tests/trousers_start.sh    | 18 ++++++++++++++++++
 engine/tests/Functional.trousers/trousers_test.sh  |  4 ++++
 6 files changed, 86 insertions(+)
 create mode 100644 engine/tests/Functional.trousers/fuego_test.sh
 create mode 100644 engine/tests/Functional.trousers/parser.py
 create mode 100644 engine/tests/Functional.trousers/spec.json
 create mode 100644
engine/tests/Functional.trousers/tests/trousers_help.sh
 create mode 100644
engine/tests/Functional.trousers/tests/trousers_start.sh
 create mode 100755 engine/tests/Functional.trousers/trousers_test.sh
engine/tests/Functional.trousers/fuego_test.sh new file +0 -0
new file mode 100644
index 0000000..25b68cd

engine/tests/Functional.trousers/fuego_test.sh line 3

Quoted 3 lines
engine/tests/Functional.trousers/fuego_test.sh new file +3 -0
@@ -0,0 +1,19 @@
+function test_pre_check {
+    is_on_target_path tcsd PROGRAM_TCSD
+    assert_define PROGRAM_TCSD "Missing 'tcsd' program on target board"

Should be 'assert_has_program tcsd'

Quoted 73 lines
engine/tests/Functional.trousers/fuego_test.sh new file +5 -0
+}
+
+function test_deploy {
+    put $TEST_HOME/trousers_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+    put $FUEGO_CORE/engine/scripts/fuego_board_function_lib.sh

$BOARD_TESTDIR/fuego.$TESTDIR

engine/tests/Functional.trousers/fuego_test.sh new file +11 -0
+    put -r $TEST_HOME/tests $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+    report "cd $BOARD_TESTDIR/fuego.$TESTDIR;\
+    ./trousers_test.sh"
+}
+
+function test_processing {
+    log_compare "$TESTDIR" "0" "TEST-FAIL" "n"
+}
engine/tests/Functional.trousers/parser.py new file +22 -0
new file mode 100644
index 0000000..d85abd7
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# See common.py for description of command-line arguments
+
+import os, sys, collections
+
+sys.path.insert(0, os.environ['FUEGO_CORE'] + '/engine/scripts/parser')
+import common as plib
+
+measurements = {}
+measurements = collections.OrderedDict()
+
+regex_string = '^ -> (.*): TEST-(.*)$'
+matches = plib.parse_log(regex_string)
+
+if matches:
+    for m in matches:
+        measurements['default.' + m[0]] = 'PASS' if m[1] == 'PASS' else 'FAIL'
+
+# split the output for each testcase
+plib.split_output_per_testcase(regex_string, measurements)
+
+sys.exit(plib.process(measurements))
engine/tests/Functional.trousers/spec.json new file +7 -0
new file mode 100644
index 0000000..668c438
@@ -0,0 +1,7 @@
+{
+    "testName": "Functional.trousers",
+    "specs": {
+        "default": {}
+    }
+}
+
engine/tests/Functional.trousers/tests/trousers_help.sh new file +6 -0
new file mode 100644
index 0000000..6d9bf4b
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+#  In target, run command tcsd.
+#  option: -h
+
+test="help"

engine/tests/Functional.trousers/tests/trousers_help.sh line 16

Quoted 10 lines
engine/tests/Functional.trousers/tests/trousers_help.sh new file +10 -0
+
+expect <<-EOF
+spawn tcsd --help
+expect {
+ "usage:" {
+           send_user " -> $test: TEST-PASS\n"
+          }
+ default { send_user " -> $test: TEST-FAIL\n" }
+}
+EOF

Using 'expect' to check the help output from the command is overkill and not acceptable.

Please pipe this to grep, or to a file, if that is not available.

Quoted 37 lines
engine/tests/Functional.trousers/tests/trousers_start.sh new file +18 -0
new file mode 100644
index 0000000..d85c532
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+#  In target, start the service tcsd.
+
+test="start"
+
+. ./fuego_board_function_lib.sh
+
+set_init_manager
+
+exec_service_on_target tcsd stop
+
+if exec_service_on_target tcsd start
+then
+    echo " -> $test: TEST-PASS"
+else
+    echo " -> $test: TEST-FAIL"
+fi
engine/tests/Functional.trousers/trousers_test.sh new file +4 -1
new file mode 100755
index 0000000..dd5ce37
@@ -0,0 +1,4 @@
+#!/bin/sh
+for i in tests/*.sh; do
+    sh $i
+done
--
Quoted 1 line

1.8.3.1

Please address the comments an re-submit.
-- Tim