validate:launcher:baseclasses: Avoid raising axception when all getting scenarios

https://bugzilla.gnome.org/show_bug.cgi?id=743994
This commit is contained in:
Thibault Saunier 2015-01-20 09:59:23 +01:00
parent 00b222f38f
commit be20eb015c

View file

@ -21,7 +21,6 @@
import os import os
import sys import sys
import imp
import re import re
import time import time
import utils import utils
@ -1056,13 +1055,13 @@ class _TestsLauncher(Loggable):
if not self._other_testsuite_for_tester(testsuite, tester): if not self._other_testsuite_for_tester(testsuite, tester):
try: try:
testlist_file = open(os.path.splitext(testsuite.__file__)[0] + ".testslist", testlist_file = open(os.path.splitext(testsuite.__file__)[0] + ".testslist",
'rw') 'rw')
know_tests = testlist_file.read().split("\n") know_tests = testlist_file.read().split("\n")
testlist_file.close() testlist_file.close()
testlist_file = open(os.path.splitext(testsuite.__file__)[0] + ".testslist", testlist_file = open(os.path.splitext(testsuite.__file__)[0] + ".testslist",
'w') 'w')
except IOError: except IOError:
return return
@ -1264,7 +1263,7 @@ class ScenarioManager(Loggable):
return scenarios return scenarios
def get_scenario(self, name): def get_scenario(self, name):
if os.path.isabs(name) and name.endswith(self.FILE_EXTENDION): if name is not None and os.path.isabs(name) and name.endswith(self.FILE_EXTENDION):
scenarios = self.discover_scenarios([name]) scenarios = self.discover_scenarios([name])
if scenarios: if scenarios: