From 6d361c6804b85b870add58b5b4a6c7df8e9476d4 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 3 Jan 2017 08:30:51 +0100 Subject: Patch logging.FileHandler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It avoids creating a dummy functest.log for unit testing. Change-Id: Ib163d5d58284822b1904444fb60b08e92ee0ab9b Signed-off-by: Cédric Ollivier --- run_unit_tests.sh | 3 --- 1 file changed, 3 deletions(-) (limited to 'run_unit_tests.sh') diff --git a/run_unit_tests.sh b/run_unit_tests.sh index e0e6195c..edce03c1 100755 --- a/run_unit_tests.sh +++ b/run_unit_tests.sh @@ -21,10 +21,7 @@ clean_results_dir # TODO clean that... # Create log dir if needed # log shall be disabled during unit tests -# fix to be done in Logger -echo "Create dummy log file...." sudo mkdir -p /home/opnfv/functest/results/odl -sudo touch /home/opnfv/functest/results/functest.log sudo touch /home/opnfv/functest/results/odl/stdout.txt sudo chmod -Rf a+rw /home/opnfv -- cgit 1.2.3-korg From 1f59d1e080531d333fd0eb4fea0a4714c709da07 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 3 Jan 2017 10:38:53 +0100 Subject: Use mock_open() to prevent stdout.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /home/opnfv is no longer required. Change-Id: Iefb8faf3a7d548f3ae7d4076005d7b0bb93e63e1 Signed-off-by: Cédric Ollivier --- functest/tests/unit/odl/test_odl.py | 12 ++++++++++++ run_unit_tests.sh | 7 ------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'run_unit_tests.sh') diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 4430c3b8..8d184203 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -195,6 +195,8 @@ class ODLTesting(unittest.TestCase): def test_main_robot_run_failed(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ + mock.patch.object(odl, 'open', mock.mock_open(), + create=True), \ self.assertRaises(RobotError): self._test_main(testcase_base.TestcaseBase.EX_RUN_ERROR, *args) @@ -203,6 +205,8 @@ class ODLTesting(unittest.TestCase): def test_main_parse_results_failed(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ + mock.patch.object(odl, 'open', mock.mock_open(), + create=True), \ mock.patch.object(self.test, 'parse_results', side_effect=RobotError): self._test_main(testcase_base.TestcaseBase.EX_RUN_ERROR, *args) @@ -223,6 +227,8 @@ class ODLTesting(unittest.TestCase): def test_main(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ + mock.patch.object(odl, 'open', mock.mock_open(), + create=True), \ mock.patch.object(self.test, 'parse_results'): self._test_main(testcase_base.TestcaseBase.EX_OK, *args) @@ -232,6 +238,8 @@ class ODLTesting(unittest.TestCase): def test_main_makedirs_oserror17(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ + mock.patch.object(odl, 'open', mock.mock_open(), + create=True), \ mock.patch.object(self.test, 'parse_results'): self._test_main(testcase_base.TestcaseBase.EX_OK, *args) @@ -241,6 +249,8 @@ class ODLTesting(unittest.TestCase): def test_main_testcases_in_failure(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ + mock.patch.object(odl, 'open', mock.mock_open(), + create=True), \ mock.patch.object(self.test, 'parse_results'): self._test_main(testcase_base.TestcaseBase.EX_OK, *args) @@ -250,6 +260,8 @@ class ODLTesting(unittest.TestCase): def test_main_remove_oserror(self, *args): with mock.patch.object(self.test, 'set_robotframework_vars', return_value=True), \ + mock.patch.object(odl, 'open', mock.mock_open(), + create=True), \ mock.patch.object(self.test, 'parse_results'): self._test_main(testcase_base.TestcaseBase.EX_OK, *args) diff --git a/run_unit_tests.sh b/run_unit_tests.sh index edce03c1..c18f3cab 100755 --- a/run_unit_tests.sh +++ b/run_unit_tests.sh @@ -18,13 +18,6 @@ function clean_results_dir { # clean it anyway clean_results_dir -# TODO clean that... -# Create log dir if needed -# log shall be disabled during unit tests -sudo mkdir -p /home/opnfv/functest/results/odl -sudo touch /home/opnfv/functest/results/odl/stdout.txt -sudo chmod -Rf a+rw /home/opnfv - # Either Workspace is set (CI) if [ -z $WORKSPACE ] then -- cgit 1.2.3-korg From d258cbb06182cf49a5a7d06f4a5350a3b696d3eb Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 4 Jan 2017 16:58:10 +0100 Subject: Remove clean_results_dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clean_results_dir is now useless [1] [1] https://gerrit.opnfv.org/gerrit/#/c/26661/ Change-Id: I7ec02798696d4cbc4930bf2d8aa9cb35ce99b7aa Signed-off-by: Cédric Ollivier --- run_unit_tests.sh | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'run_unit_tests.sh') diff --git a/run_unit_tests.sh b/run_unit_tests.sh index c18f3cab..79d05d3d 100755 --- a/run_unit_tests.sh +++ b/run_unit_tests.sh @@ -2,22 +2,6 @@ set -o errexit set -o pipefail -function clean_results_dir { - if [ -d "/home/opnfv/functest/results" ] - then - sudo rm -rf /home/opnfv/functest/results - fi -} - -# ****************************** -# prepare the env for the tests -# ****************************** -# clean useless results dir -# should be done at the end -# but in case of crash during unit test -# clean it anyway -clean_results_dir - # Either Workspace is set (CI) if [ -z $WORKSPACE ] then @@ -59,10 +43,4 @@ rc=$? deactivate -# ******* -# clean -# ******* -# Clean useless logs -clean_results_dir - exit $rc -- cgit 1.2.3-korg