提交 99e671d0 编写于 作者: A Amador Pahim

glib: adapt to changes in SimpleTest

Now there's a new parameter `executable` to use as the command line
information. The previous parameter, `name` can now be hijacked by
the yaml_loader, making this plugin to break.

This patch adapts to that change of internal API.
Signed-off-by: NAmador Pahim <apahim@redhat.com>
上级 edf73ef5
...@@ -32,21 +32,23 @@ class GLibTest(test.SimpleTest): ...@@ -32,21 +32,23 @@ class GLibTest(test.SimpleTest):
Run a GLib test command as a SIMPLE test. Run a GLib test command as a SIMPLE test.
""" """
def __init__(self, name, params=None, base_logdir=None, job=None): def __init__(self, name, params=None, base_logdir=None, job=None,
super(GLibTest, self).__init__(name, params, base_logdir, job) executable=None):
super(GLibTest, self).__init__(name, params, base_logdir, job,
executable)
@property @property
def filename(self): def filename(self):
""" """
Returns the path of the GLib test suite. Returns the path of the GLib test suite.
""" """
return self.name.name.split(':')[0] return self._filename.split(':')[0]
def test(self): def test(self):
""" """
Create the GLib command and execute it. Create the GLib command and execute it.
""" """
test_name = self.name.name.split(':')[1] test_name = self._filename.split(':')[1]
cmd = '%s -p=%s' % (self.filename, test_name) cmd = '%s -p=%s' % (self.filename, test_name)
result = process.run(cmd, ignore_status=True) result = process.run(cmd, ignore_status=True)
if result.exit_status != 0: if result.exit_status != 0:
...@@ -85,7 +87,8 @@ class GLibLoader(loader.TestLoader): ...@@ -85,7 +87,8 @@ class GLibLoader(loader.TestLoader):
result = process.run(cmd) result = process.run(cmd)
except Exception as details: except Exception as details:
if which_tests == loader.ALL: if which_tests == loader.ALL:
return [(NotGLibTest, {"name": "%s: %s" % (reference, details)})] return [(NotGLibTest,
{"name": "%s: %s" % (reference, details)})]
return [] return []
for test in result.stdout.splitlines(): for test in result.stdout.splitlines():
...@@ -96,7 +99,8 @@ class GLibLoader(loader.TestLoader): ...@@ -96,7 +99,8 @@ class GLibLoader(loader.TestLoader):
if subtests_filter and not subtests_filter.search(test_name): if subtests_filter and not subtests_filter.search(test_name):
continue continue
avocado_suite.append((GLibTest, {'name': test_name})) avocado_suite.append((GLibTest, {'name': test_name,
'executable': test_name}))
if which_tests is loader.ALL and not avocado_suite: if which_tests is loader.ALL and not avocado_suite:
return [(NotGLibTest, return [(NotGLibTest,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册