From a5a37442adefd7ed77eb5023851ed02a2d80baf9 Mon Sep 17 00:00:00 2001 From: dave <dave@dtu.dk> Date: Thu, 31 Mar 2016 16:36:47 +0200 Subject: [PATCH] prepost tests: use absolute path when reading data --- wetb/prepost/tests/test_hawcstab2.py | 15 ++++++++------- wetb/prepost/tests/test_windIO.py | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/wetb/prepost/tests/test_hawcstab2.py b/wetb/prepost/tests/test_hawcstab2.py index a260b8a..249df20 100644 --- a/wetb/prepost/tests/test_hawcstab2.py +++ b/wetb/prepost/tests/test_hawcstab2.py @@ -11,25 +11,26 @@ from future import standard_library standard_library.install_aliases() import unittest +import os import numpy as np from wetb.prepost.hawcstab2 import results, hs2_control_tuning -# path for test data files -#fpath = os.path.join(os.path.dirname(__file__), 'data/') - class Tests(unittest.TestCase): """ """ def setUp(self): - self.fpath_linear = 'data/controller_input_linear.txt' - self.fpath_quadratic = 'data/controller_input_quadratic.txt' + self.fpath_linear = os.path.join(os.path.dirname(__file__), + 'data/controller_input_linear.txt') + self.fpath_quad = os.path.join(os.path.dirname(__file__), + 'data/controller_input_quadratic.txt') def test_cmb_df(self): - fname1 = 'data/campbell_diagram.cmb' + fname1 = os.path.join(os.path.dirname(__file__), + 'data/campbell_diagram.cmb') speed, freq, damp = results().load_cmb(fname1) df = results().load_cmb_df(fname1) @@ -69,7 +70,7 @@ class Tests(unittest.TestCase): def test_quadratic_file(self): hs2 = hs2_control_tuning() - hs2.read_parameters(self.fpath_quadratic) + hs2.read_parameters(self.fpath_quad) self.assertEqual(hs2.pi_gen_reg1.K, 0.108313E+07) diff --git a/wetb/prepost/tests/test_windIO.py b/wetb/prepost/tests/test_windIO.py index 67239c7..e6951ab 100644 --- a/wetb/prepost/tests/test_windIO.py +++ b/wetb/prepost/tests/test_windIO.py @@ -11,6 +11,7 @@ from future import standard_library standard_library.install_aliases() import unittest +import os import numpy as np @@ -20,7 +21,8 @@ from wetb.prepost.windIO import LoadResults class TestsLoadResults(unittest.TestCase): def setUp(self): - self.respath = '../../hawc2/tests/test_files/hawc2io/' + self.respath = os.path.join(os.path.dirname(__file__), + '../../hawc2/tests/test_files/hawc2io/') self.fascii = 'Hawc2ascii' self.fbin = 'Hawc2bin' -- GitLab