allow multiple arguments for logilab.common.testlib.TestCase.datapath.\n\ndatapath now handle multiple argument as os.path.join do

2 files changed, 7 insertions, 2 deletions

diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py
index 152ccc7..19aa281 100644
--- a/test/unittest_testlib.py
+++ b/test/unittest_testlib.py
@@ -221,6 +221,11 @@ class TestlibTC(TestCase):
         self.assertEquals(self.datadir, expected_datadir)
         self.assertEquals(self.datapath('foo'), join(expected_datadir, 'foo'))
 
+    def test_multiple_args_datadir(self):
+        expected_datadir = join(dirname(abspath(__file__)), 'data')
+        self.assertEquals(self.datadir, expected_datadir)
+        self.assertEquals(self.datapath('foo', 'bar'), join(expected_datadir, 'foo', 'bar'))
+
     def test_custom_datadir(self):
         class MyTC(TestCase):
             datadir = 'foo'
diff --git a/testlib.py b/testlib.py
index 83edc37..085fc92 100644
--- a/testlib.py
+++ b/testlib.py
@@ -1010,9 +1010,9 @@ class TestCase(unittest.TestCase):
     # instantiated for each test run)
     datadir = classproperty(cached(datadir))
 
-    def datapath(cls, fname):
+    def datapath(cls, *fname):
         """joins the object's datadir and `fname`"""
-        return osp.join(cls.datadir, fname)
+        return osp.join(cls.datadir, *fname)
     datapath = classmethod(datapath)
 
     def set_description(self, descr):