Include UpdateCheckout in SyncToUpstreamRunner.

This is necessary to support syncing from a clean tree.
This commit is contained in:
Ms2ger 2016-02-26 11:07:47 +01:00
parent 26b40afe23
commit 070d3ffa54

View file

@ -4,7 +4,7 @@ import subprocess
import sys import sys
import urlparse 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.tree import get_unique_name
from wptrunner.update.base import Step, StepRunner, exit_clean, exit_unclean from wptrunner.update.base import Step, StepRunner, exit_clean, exit_unclean
@ -364,7 +364,8 @@ class PRDeleteBranch(Step):
class SyncToUpstreamRunner(StepRunner): class SyncToUpstreamRunner(StepRunner):
"""Runner for syncing local changes to upstream""" """Runner for syncing local changes to upstream"""
steps = [LoadManifest, steps = [UpdateCheckout,
LoadManifest,
CheckoutBranch, CheckoutBranch,
GetLastSyncCommit, GetLastSyncCommit,
GetBaseCommit, GetBaseCommit,