summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylanx.c.baker@intel.com>2014-12-29 15:45:39 -0800
committerDylan Baker <baker.dylan.c@gmail.com>2015-01-07 11:29:43 -0800
commit1efb99ae09368599bd6b67a71b5e7f3d825ed4aa (patch)
treee477292474ad243330ad09aaec0e64624257d76a
parentae87fbaaae75ddb09e6e32d9acc1da74196f8898 (diff)
xts.py: Fix grouptools bugs
1) Use of grouptools where os.path should have been used (hitting a grouptools assert) 2) Using grouptools.relgroup instead of from_path(os.path.relpath()) This wasn't causing a problem since xts is run primarily on Unices, but it wasn't correct. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
-rw-r--r--tests/xts.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/xts.py b/tests/xts.py
index 066155829..d4577b6a2 100644
--- a/tests/xts.py
+++ b/tests/xts.py
@@ -73,7 +73,7 @@ class XTSTest(Test):
def __init__(self, name, testname, testnum):
super(XTSTest, self).__init__(
- ['./' + grouptools.groupname(name), '-i', str(testnum)])
+ ['./' + os.path.basename(name), '-i', str(testnum)])
self.testname = '{0}-{1}'.format(testname, testnum)
self.cwd = os.path.dirname(os.path.realpath(name))
self.test_results_file = os.path.join(self.cwd, self.testname)
@@ -185,8 +185,9 @@ def populate_profile():
if line.startswith('>>ASSERTION'):
num = next(counts)
group = grouptools.join(
- grouptools.relgroup(dirpath, X_TEST_SUITE),
- testname, num)
+ grouptools.from_path(
+ os.path.relpath(dirpath, X_TEST_SUITE)),
+ testname, str(num))
profile.test_list[group] = XTSTest(
os.path.join(dirpath, testname),