loader.py (12882:dd87d7f2f3e5) loader.py (14141:b3ceff47211a)
1# Copyright (c) 2017 Mark D. Hill and David A. Wood
2# All rights reserved.
3#
4# Redistribution and use in source and binary forms, with or without
5# modification, are permitted provided that the following conditions are
6# met: redistributions of source code must retain the above copyright
7# notice, this list of conditions and the following disclaimer;
8# redistributions in binary form must reproduce the above copyright

--- 133 unchanged lines hidden (view full) ---

142 self.suite_uids = {}
143 self.filepath_filter = default_filepath_filter
144
145 # filepath -> Successful | Failed to load
146 self._files = {}
147
148 @property
149 def schedule(self):
1# Copyright (c) 2017 Mark D. Hill and David A. Wood
2# All rights reserved.
3#
4# Redistribution and use in source and binary forms, with or without
5# modification, are permitted provided that the following conditions are
6# met: redistributions of source code must retain the above copyright
7# notice, this list of conditions and the following disclaimer;
8# redistributions in binary form must reproduce the above copyright

--- 133 unchanged lines hidden (view full) ---

142 self.suite_uids = {}
143 self.filepath_filter = default_filepath_filter
144
145 # filepath -> Successful | Failed to load
146 self._files = {}
147
148 @property
149 def schedule(self):
150 return wrappers.LoadedLibrary(self.suites, fixture_mod.global_fixtures)
150 return wrappers.LoadedLibrary(self.suites)
151
152 def load_schedule_for_suites(self, *uids):
153 files = {uid.UID.uid_to_path(id_) for id_ in uids}
154 for file_ in files:
155 self.load_file(file_)
156
157 return wrappers.LoadedLibrary(
151
152 def load_schedule_for_suites(self, *uids):
153 files = {uid.UID.uid_to_path(id_) for id_ in uids}
154 for file_ in files:
155 self.load_file(file_)
156
157 return wrappers.LoadedLibrary(
158 [self.suite_uids[id_] for id_ in uids],
159 fixture_mod.global_fixtures)
158 [self.suite_uids[id_] for id_ in uids])
160
161 def _verify_no_duplicate_suites(self, new_suites):
162 new_suite_uids = self.suite_uids.copy()
163 for suite in new_suites:
164 if suite.uid in new_suite_uids:
165 raise DuplicateTestItemException(
166 "More than one suite with UID '%s' was defined" %\
167 suite.uid)

--- 135 unchanged lines hidden --- 		159
160 def _verify_no_duplicate_suites(self, new_suites):
161 new_suite_uids = self.suite_uids.copy()
162 for suite in new_suites:
163 if suite.uid in new_suite_uids:
164 raise DuplicateTestItemException(
165 "More than one suite with UID '%s' was defined" %\
166 suite.uid)

--- 135 unchanged lines hidden ---