a24debcbf8
When not using interactive mode, ensure that git rebase is called as a subprocess to ensure git-upstream can switch the final branch to the merged result after completion of the import. Only where interactive mode is enabled should the branch remain on the import branch after running to completion and leave it to the user to switch to the target branch, as otherwise git-rebase will throw an error. Change-Id: I633a371775b5a177c76529a49b44fb841d9c1332 Related-Bug: #1625876
116 lines
4.9 KiB
Python
116 lines
4.9 KiB
Python
# Copyright (c) 2016 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Tests for the --interactive option to the 'import' command"""
|
|
|
|
import os
|
|
import subprocess
|
|
|
|
import mock
|
|
from testscenarios import TestWithScenarios
|
|
from testtools.content import text_content
|
|
from testtools.matchers import Contains
|
|
from testtools.matchers import Equals
|
|
from testtools.matchers import Not
|
|
|
|
from git_upstream.lib.pygitcompat import Commit
|
|
from git_upstream import main
|
|
from git_upstream.tests.base import BaseTestCase
|
|
from git_upstream.tests.base import get_scenarios
|
|
|
|
|
|
@mock.patch.dict('os.environ', {'GIT_SEQUENCE_EDITOR': 'cat'})
|
|
class TestImportInteractiveCommand(TestWithScenarios, BaseTestCase):
|
|
|
|
scenarios = get_scenarios(os.path.join(os.path.dirname(__file__),
|
|
"interactive_scenarios"))
|
|
|
|
def setUp(self):
|
|
# add description in case parent setup fails.
|
|
self.addDetail('description', text_content(self.desc))
|
|
|
|
self.commands, self.parser = main.build_parsers()
|
|
script_cmdline = self.parser.get_default('script_cmdline')
|
|
script_cmdline[-1] = os.path.join(os.getcwd(), main.__file__)
|
|
self.parser.set_defaults(script_cmdline=script_cmdline)
|
|
|
|
# builds the tree to be tested
|
|
super(TestImportInteractiveCommand, self).setUp()
|
|
|
|
def test_interactive(self):
|
|
upstream_branch = self.branches['upstream'][0]
|
|
target_branch = self.branches['head'][0]
|
|
|
|
cmdline = self.parser.get_default('script_cmdline') + self.parser_args
|
|
try:
|
|
self.output = subprocess.check_output(cmdline,
|
|
stderr=subprocess.STDOUT)
|
|
except subprocess.CalledProcessError as cpe:
|
|
self.addDetail('subprocess-output',
|
|
text_content(cpe.output.decode('utf-8')))
|
|
raise
|
|
self.addDetail('subprocess-output',
|
|
text_content(self.output.decode('utf-8')))
|
|
|
|
expected = getattr(self, 'expect_rebased', [])
|
|
if expected:
|
|
changes = list(Commit.iter_items(
|
|
self.repo, '%s..%s^2' % (upstream_branch, target_branch)))
|
|
self.assertThat(
|
|
len(changes), Equals(len(expected)),
|
|
"should only have seen %s changes, got: %s" %
|
|
(len(expected),
|
|
", ".join(["%s:%s" % (commit.hexsha,
|
|
commit.message.splitlines()[0])
|
|
for commit in changes])))
|
|
|
|
# expected should be listed in order from oldest to newest, so
|
|
# reverse changes to match as it would be newest to oldest.
|
|
changes.reverse()
|
|
for commit, node in zip(changes, expected):
|
|
subject = commit.message.splitlines()[0]
|
|
node_subject = self.gittree.graph[node].message.splitlines()[0]
|
|
self.assertThat(subject, Equals(node_subject),
|
|
"subject '%s' of commit '%s' does not match "
|
|
"subject '%s' of node '%s'" % (
|
|
subject, commit.hexsha, node_subject,
|
|
node))
|
|
import_branch = [head for head in self.repo.heads
|
|
if str(head).startswith("import") and
|
|
not str(head).endswith("-base")]
|
|
|
|
self.assertThat(self.git.rev_parse(import_branch),
|
|
Not(Equals(self.git.rev_parse(target_branch))),
|
|
"Import branch and target should have identical "
|
|
"contents, but not be the same")
|
|
|
|
# allow disabling of checking the merge commit contents
|
|
# as some tests won't result in an import
|
|
if getattr(self, 'check_merge', True):
|
|
commit_message = self.git.log(target_branch, n=1)
|
|
self.assertThat(commit_message,
|
|
Contains("of '%s' into '%s'" % (upstream_branch,
|
|
target_branch)))
|
|
|
|
# allow additional test specific verification methods below
|
|
extra_test_func = getattr(self, '_verify_%s' % self.name, None)
|
|
if extra_test_func:
|
|
extra_test_func()
|
|
|
|
def _verify_basic(self):
|
|
self.assertThat(
|
|
self.output.decode('utf-8'),
|
|
Contains("Successfully rebased and updated refs/heads/import/"))
|