prune main for cherry picks
Change-Id: Ie9b87fe5e78e7663e2488eac9a5dcf1929a460da
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/28861
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 91e22a4..9d5f9fd 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -284,29 +284,9 @@
if self.m.properties.get('git_branch', '') in ['beta', 'stable']:
branches = self.current_commit_branches(checkout_path)
branches = [b for b in branches if b.startswith('flutter')]
- # The following paragraph justifies why we need to write in the logic as one - liners
- # the way these tests work are that they will not execute the actual command, but execute a placeholder command
- # given its original format of if statement, the closest I can get to trigger the logic is the following:
- # release_checkout_path = api.path['start_dir'].join('release')
- # api.repo_util.checkout('flutter', release_checkout_path, ref='680962aa75a3c0ea8a55c57adc98944f5558bafd')
- # api.repo_util.get_branch(release_checkout_path)
- # api.repo_util.in_release_and_main(release_checkout_path)
- # We would expect the sha to be passed in to list branches, so that we can get a branch name that starts with flutter,
- # However, the git command was never performed verbosely, and instead if we study the output json file, we get
- # "git",
- # "branch",
- # "-a",
- # "--contains",
- # ""
- # This manifests that what the test train is seeking is only code coverage, and it has no interest in performing
- # the exact logic and properly setting up the variables.
- # Now that we know tests are placeholders and only line nubmer based coverage is checked, we are left with two options:
- # Either set some sort of api property and pass in to this function for override (which
- # is not reasonable), or squeeze the if check into a one-liner.
return branches[0] if len(branches) > 0 else self.m.properties.get(
'git_branch', ''
)
-
return self.m.properties.get('git_branch', '')
def flutter_environment(self, checkout_path):
