x/git-upstream
Code Issues Proposed changes

Fix simple_rebase functional test

Browse Source 
Change-Id: I5ba5cdaa8b088ba42d53cdb3c58b1632d31c5139
This commit is contained in:
Davide Guerri
2014-02-06 22:22:11 +00:00
parent b28c308a09
commit 1803a8b1aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
functional-tests/040-test_simple_rebase.sh
View File

@@ -13,7 +13,7 @@ CHERRY_PICKS="19b89746d08fa224bb8aba12106dbc330cb5d019 \
5d4fbe79037c3b2516216258a907d3a02f0b205c" 5d4fbe79037c3b2516216258a907d3a02f0b205c"
TEST_REBASE_REF="fd3524e1b7353cda228b6fb73c3a2d34a4fee4de" TEST_REBASE_REF="fd3524e1b7353cda228b6fb73c3a2d34a4fee4de"
SUCCESS_SHA1="b8aee554fd9e22c05cfd8c20f6c19d26320fc293 ?-" SUCCESS_SHA1="e1dfee279aa5b6b05296a97b4eba8dde0b6eea4b ?-"
function test_simple_rebase() { function test_simple_rebase() {
log DEBUG "Starting $TEST_NAME::$FUNCNAME" log DEBUG "Starting $TEST_NAME::$FUNCNAME"
@@ -58,7 +58,7 @@ EOP
git-hp import-upstream import/$TEST_NAME-new >/dev/null || return 1 git-hp import-upstream import/$TEST_NAME-new >/dev/null || return 1
local test_sha1="$(git log --pretty=format:"%s"|sort | shasum -p -)" local test_sha1="$(git show --numstat | tail -9 | shasum -p -)"
if [ "$test_sha1" != "$SUCCESS_SHA1" ] if [ "$test_sha1" != "$SUCCESS_SHA1" ]
then then
popd >/dev/null popd >/dev/null