Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(969)

Unified Diff: tests/masters_recipes_test.py

Issue 1347263002: Revert of Cross-repo recipe package system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/tools/unittests/show_me_the_modules_test.py ('k') | third_party/infra/README » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/masters_recipes_test.py
diff --git a/tests/masters_recipes_test.py b/tests/masters_recipes_test.py
index e1c549ff9da9721578418dadb96c33ea01daa9ca..54859ecaec7f3681e31734899d6413bed7963b6f 100755
--- a/tests/masters_recipes_test.py
+++ b/tests/masters_recipes_test.py
@@ -11,6 +11,16 @@
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+sys.path.insert(0, os.path.join(BASE_DIR, 'scripts'))
+sys.path.insert(0, os.path.join(BASE_DIR, 'scripts', 'slave', 'recipes'))
+sys.path.insert(
+ 0, os.path.join(BASE_DIR, 'scripts', 'slave', 'recipe_modules'))
+sys.path.insert(0, os.path.join(BASE_DIR, 'third_party'))
+
+import chromium_trybot
+from chromium_tests.builders import BUILDERS
MAIN_WATERFALL_MASTERS = [
@@ -92,23 +102,6 @@
}
-def getBuilders(recipe_name):
- """Asks the given recipe to dump its BUILDERS dictionary.
-
- This must be implemented by the recipe in question.
- """
- (fh, builders_file) = tempfile.mkstemp('.json')
- os.close(fh)
- try:
- subprocess.check_call([
- os.path.join(BASE_DIR, 'scripts', 'slave', 'recipes.py'),
- 'run', recipe_name, 'dump_builders=%s' % builders_file])
- with open(builders_file) as fh:
- return json.load(fh)
- finally:
- os.remove(builders_file)
-
-
def getMasterConfig(master):
with tempfile.NamedTemporaryFile() as f:
subprocess.check_call([
@@ -138,9 +131,6 @@
exit_code = 0
- chromium_trybot_BUILDERS = getBuilders('chromium_trybot')
- chromium_BUILDERS = getBuilders('chromium')
-
for master in MAIN_WATERFALL_MASTERS:
builders = getBuildersAndRecipes(master)
all_builders.update((master, b) for b in builders)
@@ -154,7 +144,7 @@
# are not using chromium recipe. This might make it harder to experiment
# with switching bots over to chromium recipe though, so it may be better
# to just wait until the switch is done.
- recipe_side_builders = chromium_BUILDERS.get(
+ recipe_side_builders = BUILDERS.get(
master.replace('master.', ''), {}).get('builders')
if recipe_side_builders is not None:
bogus_builders = set(recipe_side_builders.keys()).difference(
@@ -177,7 +167,7 @@
for master in TRYSERVER_MASTERS:
builders = getBuildersAndRecipes(master)
- recipe_side_builders = chromium_trybot_BUILDERS[
+ recipe_side_builders = chromium_trybot.BUILDERS[
master.replace('master.', '')]['builders']
bogus_builders = set(recipe_side_builders.keys()).difference(
« no previous file with comments | « scripts/tools/unittests/show_me_the_modules_test.py ('k') | third_party/infra/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698