From 0d80b06ccd33fc2a0001b8641ce45070f0e8726d Mon Sep 17 00:00:00 2001 From: hagbard Date: Mon, 21 Jan 2019 13:10:46 -0800 Subject: adjusted unit test --- src/tests/test_task_scheduler.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/tests') diff --git a/src/tests/test_task_scheduler.py b/src/tests/test_task_scheduler.py index 084bd868c..c08dfd33d 100644 --- a/src/tests/test_task_scheduler.py +++ b/src/tests/test_task_scheduler.py @@ -88,19 +88,19 @@ class TestUpdateCrontab(unittest.TestCase): 'tasks': [{'name': 'aaa', 'interval': '60m', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '*/60 * * * * root sg vyattacfg \"/bin/ls -l\"'] + '*/60 * * * * vyos sg vyattacfg \"/bin/ls -l\"'] }, {'name': 'one_task_with_hour', 'tasks': [{'name': 'aaa', 'interval': '10h', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '0 */10 * * * root sg vyattacfg \"/bin/ls -l\"'] + '0 */10 * * * vyos sg vyattacfg \"/bin/ls -l\"'] }, {'name': 'one_task_with_day', 'tasks': [{'name': 'aaa', 'interval': '10d', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '0 0 */10 * * root sg vyattacfg \"/bin/ls -l\"'] + '0 0 */10 * * vyos sg vyattacfg \"/bin/ls -l\"'] }, {'name': 'multiple_tasks', 'tasks': [{'name': 'aaa', 'interval': '60m', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}, @@ -108,8 +108,8 @@ class TestUpdateCrontab(unittest.TestCase): ], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '*/60 * * * * root sg vyattacfg \"/bin/ls -l\"', - '0 0 * * * root sg vyattacfg \"/bin/ls -ltr\"'] + '*/60 * * * * vyos sg vyattacfg \"/bin/ls -l\"', + '0 0 * * * vyos sg vyattacfg \"/bin/ls -ltr\"'] } ] for t in tests: -- cgit v1.2.3 From 58d1afe53c2ad1385b87323c899286dab276974e Mon Sep 17 00:00:00 2001 From: hagbard Date: Tue, 22 Jan 2019 10:33:14 -0800 Subject: Revert "adjusted unit test" This reverts commit 0d80b06ccd33fc2a0001b8641ce45070f0e8726d. --- src/tests/test_task_scheduler.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/tests') diff --git a/src/tests/test_task_scheduler.py b/src/tests/test_task_scheduler.py index c08dfd33d..084bd868c 100644 --- a/src/tests/test_task_scheduler.py +++ b/src/tests/test_task_scheduler.py @@ -88,19 +88,19 @@ class TestUpdateCrontab(unittest.TestCase): 'tasks': [{'name': 'aaa', 'interval': '60m', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '*/60 * * * * vyos sg vyattacfg \"/bin/ls -l\"'] + '*/60 * * * * root sg vyattacfg \"/bin/ls -l\"'] }, {'name': 'one_task_with_hour', 'tasks': [{'name': 'aaa', 'interval': '10h', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '0 */10 * * * vyos sg vyattacfg \"/bin/ls -l\"'] + '0 */10 * * * root sg vyattacfg \"/bin/ls -l\"'] }, {'name': 'one_task_with_day', 'tasks': [{'name': 'aaa', 'interval': '10d', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '0 0 */10 * * vyos sg vyattacfg \"/bin/ls -l\"'] + '0 0 */10 * * root sg vyattacfg \"/bin/ls -l\"'] }, {'name': 'multiple_tasks', 'tasks': [{'name': 'aaa', 'interval': '60m', 'spec': '', 'executable': '/bin/ls', 'args': '-l'}, @@ -108,8 +108,8 @@ class TestUpdateCrontab(unittest.TestCase): ], 'expected': [ '### Generated by vyos-update-crontab.py ###', - '*/60 * * * * vyos sg vyattacfg \"/bin/ls -l\"', - '0 0 * * * vyos sg vyattacfg \"/bin/ls -ltr\"'] + '*/60 * * * * root sg vyattacfg \"/bin/ls -l\"', + '0 0 * * * root sg vyattacfg \"/bin/ls -ltr\"'] } ] for t in tests: -- cgit v1.2.3 From 6d172d767360a675462da6a0bac100a24c544892 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Sat, 26 Jan 2019 01:26:36 +0100 Subject: T1193: add some tests for the config parser. --- Makefile | 2 +- src/tests/test_config_parser.py | 43 +++++++++++++++++++++++++++++++++++++++++ src/tests/test_initial_setup.py | 2 +- tests/data/config.valid | 29 +++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 src/tests/test_config_parser.py create mode 100644 tests/data/config.valid (limited to 'src/tests') diff --git a/Makefile b/Makefile index a9926137c..dd3d2d00f 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ clean: .PHONY: test test: - PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators --verbose + PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators,src/tests --verbose .PHONY: sonar sonar: diff --git a/src/tests/test_config_parser.py b/src/tests/test_config_parser.py new file mode 100644 index 000000000..f58ff23bf --- /dev/null +++ b/src/tests/test_config_parser.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2018 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# + +import os +import tempfile +import unittest +from unittest import TestCase, mock + +import vyos.configtree + + +class TestConfigParser(TestCase): + def setUp(self): + with open('tests/data/config.valid', 'r') as f: + config_string = f.read() + self.config = vyos.configtree.ConfigTree(config_string) + + def test_top_level_valueless(self): + self.assertTrue(self.config.exists(["top-level-valueless-node"])) + + def test_top_level_leaf(self): + self.assertTrue(self.config.exists(["top-level-leaf-node"])) + self.assertEqual(self.config.return_value(["top-level-leaf-node"]), "foo") + + def test_top_level_tag(self): + self.assertTrue(self.config.exists(["top-level-tag-node"])) + # No sorting is intentional, child order must be preserved + self.assertEqual(self.config.list_nodes(["top-level-tag-node"]), ["foo", "bar"]) diff --git a/src/tests/test_initial_setup.py b/src/tests/test_initial_setup.py index 023a30723..c4c59b827 100644 --- a/src/tests/test_initial_setup.py +++ b/src/tests/test_initial_setup.py @@ -25,7 +25,7 @@ import vyos.configtree import vyos.initialsetup as vis -class TestHostName(TestCase): +class TestInitialSetup(TestCase): def setUp(self): with open('tests/data/config.boot.default', 'r') as f: config_string = f.read() diff --git a/tests/data/config.valid b/tests/data/config.valid new file mode 100644 index 000000000..353e96df4 --- /dev/null +++ b/tests/data/config.valid @@ -0,0 +1,29 @@ +/* top level leaf node */ +top-level-leaf-node foo + +top-level-valueless-node + +top-level-tag-node foo { + top-level-tag-node-child some-value +} + +top-level-tag-node bar { + top-level-tag-node-child another-value +} + +normal-node { + normal-node-child { + valueless-node + multi-node value1 + /* valueless node comment */ + another-valueless-node + multi-node value1 + tag-node foo { + } + one-more-valueless-node + tag-node bar { + some-option some-value + } + } + option-with-quoted-value "some-value" +} -- cgit v1.2.3