diff options
-rw-r--r-- | test/unittest_configuration.py | 6 | ||||
-rw-r--r-- | test/unittest_shellutils.py | 4 | ||||
-rw-r--r-- | test/unittest_umessage.py | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/test/unittest_configuration.py b/test/unittest_configuration.py index 6667b3c..11e9f33 100644 --- a/test/unittest_configuration.py +++ b/test/unittest_configuration.py @@ -17,6 +17,8 @@ # with logilab-common. If not, see <http://www.gnu.org/licenses/>. import tempfile import os +from os.path import join, dirname, abspath + from cStringIO import StringIO from sys import version_info @@ -25,6 +27,8 @@ from logilab.common.optik_ext import OptionValueError from logilab.common.configuration import Configuration, \ OptionsManagerMixIn, OptionsProviderMixIn, Method, read_old_config +DATA = join(dirname(abspath(__file__)), 'data') + options = [('dothis', {'type':'yn', 'action': 'store', 'default': True, 'metavar': '<y or n>'}), ('value', {'type': 'string', 'metavar': '<string>', 'short': 'v'}), ('multiple', {'type': 'csv', 'default': ('yop','yep'), @@ -278,7 +282,7 @@ options: changes = [('renamed', 'renamed', 'choice'), ('moved', 'named', 'old', 'test'), ] - read_old_config(self.cfg, changes, 'data/test.ini') + read_old_config(self.cfg, changes, join(DATA, 'test.ini')) stream = StringIO() self.cfg.generate_config(stream) self.assertMultiLineEqual(stream.getvalue().strip(), """[TEST] diff --git a/test/unittest_shellutils.py b/test/unittest_shellutils.py index 444e75e..10a51c0 100644 --- a/test/unittest_shellutils.py +++ b/test/unittest_shellutils.py @@ -18,7 +18,7 @@ """unit tests for logilab.common.shellutils""" import sys, os, tempfile, shutil -from os.path import join +from os.path import join, dirname, abspath import datetime, time from StringIO import StringIO @@ -30,7 +30,7 @@ from logilab.common.shellutils import (globfind, find, ProgressBar, from logilab.common.compat import str_to_bytes from logilab.common.proc import NoSuchProcess -DATA_DIR = join('data','find_test') +DATA_DIR = join(dirname(abspath(__file__)), 'data', 'find_test') class FindTC(TestCase): def test_include(self): diff --git a/test/unittest_umessage.py b/test/unittest_umessage.py index 9bf3439..5480637 100644 --- a/test/unittest_umessage.py +++ b/test/unittest_umessage.py @@ -16,18 +16,20 @@ # # You should have received a copy of the GNU Lesser General Public License along # with logilab-common. If not, see <http://www.gnu.org/licenses/>. +import email +from os.path import join, dirname, abspath from logilab.common.testlib import TestCase, unittest_main from logilab.common.umessage import UMessage, decode_QP -import email +DATA = join(dirname(abspath(__file__)), 'data') class UMessageTC(TestCase): def setUp(self): - msg1 = email.message_from_file(open('data/test1.msg')) + msg1 = email.message_from_file(open(join(DATA, 'test1.msg'))) self.umessage1 = UMessage(msg1) - msg2 = email.message_from_file(open('data/test2.msg')) + msg2 = email.message_from_file(open(join(DATA, 'test2.msg'))) self.umessage2 = UMessage(msg2) def test_get_subject(self): |