From 070d3ffa547b5cde9dafb3f64ea8af5f883e1b68 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 26 Feb 2016 11:07:47 +0100 Subject: [PATCH] Include UpdateCheckout in SyncToUpstreamRunner. This is necessary to support syncing from a clean tree. --- tests/wpt/update/upstream.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/wpt/update/upstream.py b/tests/wpt/update/upstream.py index 61b06437138..67a19f43ee8 100644 --- a/tests/wpt/update/upstream.py +++ b/tests/wpt/update/upstream.py @@ -4,7 +4,7 @@ import subprocess import sys import urlparse -from wptrunner.update.sync import LoadManifest +from wptrunner.update.sync import LoadManifest, UpdateCheckout from wptrunner.update.tree import get_unique_name from wptrunner.update.base import Step, StepRunner, exit_clean, exit_unclean @@ -364,7 +364,8 @@ class PRDeleteBranch(Step): class SyncToUpstreamRunner(StepRunner): """Runner for syncing local changes to upstream""" - steps = [LoadManifest, + steps = [UpdateCheckout, + LoadManifest, CheckoutBranch, GetLastSyncCommit, GetBaseCommit,