From df7cd48bf08a375df23660ee2cd848e2bd9df6e2 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 21 Sep 2011 17:33:07 -0500 Subject: update: correct failing tests Commit dec4b73aa0 ("Allow `brew update --rebase`") changed the format of the `git pull` command slightly, introducing an extra space (to allow for the --rebase option), so let's update the test expectations for this. We still need to write tests for '--rebase', but in the meantime they once again pass for the normal case. Signed-off-by: Jack Nagel --- Library/Homebrew/test/test_updater.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb index 496de293a..57a3c155d 100644 --- a/Library/Homebrew/test/test_updater.rb +++ b/Library/Homebrew/test/test_updater.rb @@ -70,7 +70,7 @@ class UpdaterTests < Test::Unit::TestCase updater.in_prefix_expect("git remote add origin #{RefreshBrewMock::REPOSITORY_URL}") updater.in_prefix_expect("git fetch origin") updater.in_prefix_expect("git reset --hard origin/master") - updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") + updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") updater.in_prefix_expect("git rev-parse HEAD", "1234abcd") assert_equal false, updater.update_from_masterbrew! @@ -87,7 +87,7 @@ class UpdaterTests < Test::Unit::TestCase updater.in_prefix_expect("git checkout -q master") updater.in_prefix_expect("git rev-parse HEAD", "1234abcd") updater.in_prefix_expect("git remote", "origin") - updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") + updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") updater.in_prefix_expect("git rev-parse HEAD", "3456cdef") updater.in_prefix_expect("git diff-tree -r --name-status -z 1234abcd 3456cdef", "") @@ -107,7 +107,7 @@ class UpdaterTests < Test::Unit::TestCase updater.in_prefix_expect("git checkout -q master") updater.in_prefix_expect("git rev-parse HEAD", "1234abcd") updater.in_prefix_expect("git remote", "origin") - updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") + updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") updater.in_prefix_expect("git rev-parse HEAD", "3456cdef") updater.in_prefix_expect("git diff-tree -r --name-status -z 1234abcd 3456cdef", diff_output.gsub(/\s+/, "\0")) @@ -128,7 +128,7 @@ class UpdaterTests < Test::Unit::TestCase updater.in_prefix_expect("git checkout -q master") updater.in_prefix_expect("git rev-parse HEAD", "1234abcd") updater.in_prefix_expect("git remote", "origin") - updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") + updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master") updater.in_prefix_expect("git rev-parse HEAD", "3456cdef") updater.in_prefix_expect("git diff-tree -r --name-status -z 1234abcd 3456cdef", diff_output.gsub(/\s+/, "\0")) -- cgit v1.2.3