validate: launcher: Use the ConfigPraser object everywhere for file_infos

This commit is contained in:
Thibault Saunier 2014-03-31 11:03:48 +02:00
parent 3d8201d52b
commit 36a0f6a674

View file

@ -181,7 +181,7 @@ class GstValidateMediaCheckTest(Test):
timeout=timeout) timeout=timeout)
self._uri = uri self._uri = uri
self.file_infos = file_infos self.file_infos = file_infos
self._media_info_path = urlparse.urlparse(file_infos.path).path self._media_info_path = urlparse.urlparse(file_infos.get("file-info", "uri")).path
def build_arguments(self): def build_arguments(self):
self.add_arguments(self._uri, "--expected-results", self.add_arguments(self._uri, "--expected-results",
@ -304,7 +304,7 @@ class GstValidateManager(TestsManager, Loggable):
self.add_test(GstValidateMediaCheckTest(classname, self.add_test(GstValidateMediaCheckTest(classname,
self.options, self.options,
self.reporter, self.reporter,
mediainfo, mediainfo.config,
uri, uri,
timeout=timeout)) timeout=timeout))
@ -435,8 +435,8 @@ class GstValidateManager(TestsManager, Loggable):
def needs_http_server(self): def needs_http_server(self):
for test in self.list_tests(): for test in self.list_tests():
if self._is_test_wanted(test): if self._is_test_wanted(test):
protocol = test.file_infos.config.get("file-info", "protocol") protocol = test.file_infos.get("file-info", "protocol")
uri = test.file_infos.config.get("file-info", "uri") uri = test.file_infos.get("file-info", "uri")
if protocol == Protocols.HTTP and \ if protocol == Protocols.HTTP and \
"127.0.0.1:%s" % (self.options.http_server_port) in uri: "127.0.0.1:%s" % (self.options.http_server_port) in uri: