diff options
Diffstat (limited to 'xtesting/ci')
| -rw-r--r-- | xtesting/ci/run_tests.py | 5 | ||||
| -rw-r--r-- | xtesting/ci/testcases.yaml | 1 | ||||
| -rw-r--r-- | xtesting/ci/tier_builder.py | 2 | ||||
| -rw-r--r-- | xtesting/ci/tier_handler.py | 11 |
4 files changed, 6 insertions, 13 deletions
diff --git a/xtesting/ci/run_tests.py b/xtesting/ci/run_tests.py index f96bd885..ea606bd4 100644 --- a/xtesting/ci/run_tests.py +++ b/xtesting/ci/run_tests.py @@ -219,12 +219,11 @@ class Runner(): tiers_to_run = [] msg = prettytable.PrettyTable( header_style='upper', padding_width=5, - field_names=['tiers', 'order', 'description', - 'testcases']) + field_names=['tiers', 'description', 'testcases']) for tier in self.tiers.get_tiers(): if tier.get_tests(): tiers_to_run.append(tier) - msg.add_row([tier.get_name(), tier.get_order(), + msg.add_row([tier.get_name(), textwrap.fill(tier.description, width=40), textwrap.fill(' '.join([str(x.get_name( )) for x in tier.get_tests()]), width=40)]) diff --git a/xtesting/ci/testcases.yaml b/xtesting/ci/testcases.yaml index 9de9c4bb..d35b4231 100644 --- a/xtesting/ci/testcases.yaml +++ b/xtesting/ci/testcases.yaml @@ -2,7 +2,6 @@ tiers: - name: samples - order: 1 description: '' testcases: - diff --git a/xtesting/ci/tier_builder.py b/xtesting/ci/tier_builder.py index 747d2263..2b212205 100644 --- a/xtesting/ci/tier_builder.py +++ b/xtesting/ci/tier_builder.py @@ -43,7 +43,7 @@ class TierBuilder(): del self.tier_objects[:] for dic_tier in self.dic_tier_array: tier = tier_handler.Tier( - name=dic_tier['name'], order=dic_tier['order'], + name=dic_tier['name'], description=dic_tier.get('description', '')) for dic_testcase in dic_tier['testcases']: testcase = tier_handler.TestCase( diff --git a/xtesting/ci/tier_handler.py b/xtesting/ci/tier_handler.py index 8359d91c..6f78f202 100644 --- a/xtesting/ci/tier_handler.py +++ b/xtesting/ci/tier_handler.py @@ -36,11 +36,10 @@ def split_text(text, max_len): class Tier(): - def __init__(self, name, order, description=""): + def __init__(self, name, description=""): self.tests_array = [] self.skipped_tests_array = [] self.name = name - self.order = order self.description = description def add_test(self, testcase): @@ -80,17 +79,13 @@ class Tier(): def get_name(self): return self.name - def get_order(self): - return self.order - def __str__(self): msg = prettytable.PrettyTable( header_style='upper', padding_width=5, - field_names=['tiers', 'order', 'description', + field_names=['tiers', 'description', 'testcases']) msg.add_row( - [self.name, self.order, - textwrap.fill(self.description, width=40), + [self.name, textwrap.fill(self.description, width=40), textwrap.fill(' '.join([str(x.get_name( )) for x in self.get_tests()]), width=40)]) return msg.get_string() |