From ccc2ba3b5463b75a2e04bb4aab75dc1f31ce54cb Mon Sep 17 00:00:00 2001 From: Dean Gardiner Date: Sat, 7 Dec 2013 13:58:55 +1300 Subject: [PATCH] Switched tools/run_tests to use the csv module. --- tools/run_tests.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/run_tests.py b/tools/run_tests.py index 9f5b6ce..8579f67 100644 --- a/tools/run_tests.py +++ b/tools/run_tests.py @@ -12,10 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +from logr import Logrs import logging -import os -from logr import Logr +import csv import sys +import os src_path = os.path.join(os.path.dirname(__file__), '..', 'src') sys.path.insert(0, os.path.abspath(src_path)) @@ -30,8 +31,8 @@ def __init__(self, debug): self.name_col = None self.test_names = None - def _read_header(self, fp): - header = fp.readline().strip().split(",") + def _read_header(self, reader): + header = next(reader) for i, col in enumerate(header): if col == 'name': @@ -45,11 +46,15 @@ def load(self, filename, limit = 100): raise Exception() with open(filename) as fp: - self._read_header(fp) + reader = csv.reader(fp) + + self._read_header(reader) self.test_names = [] - for i, line in enumerate(fp): - row = line.strip().split(',') + for i, row in enumerate(reader): + if not len(row) or row[0].startswith('#'): + continue + self.test_names.append(row[self.name_col]) if len(self.test_names) >= limit: