From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Apr 2013 21:33:02 +0000 (-0700)
Subject: Merge branch 'fc/remote-helpers-test-updates'
X-Git-Tag: v1.8.3-rc0~92
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/41e9da40a839597bbc49b6d9d3194b28c63f7dba?ds=inline;hp=-c

Merge branch 'fc/remote-helpers-test-updates'

* fc/remote-helpers-test-updates:
remote-hg: fix hg-git test-case
remote-bzr: remove stale check code for tests
remote-helpers: fix the run of all tests
remote-bzr: avoid echo -n
---

41e9da40a839597bbc49b6d9d3194b28c63f7dba
diff --combined contrib/remote-helpers/test-bzr.sh
index 4d71f711a6,8450432018..f4c77681dd
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@@ -17,20 -17,6 +17,6 @@@ if ! "$PYTHON_PATH" -c 'import bzrlib'
  	test_done
  fi
  
- cmd='
- import bzrlib
- bzrlib.initialize()
- import bzrlib.plugin
- bzrlib.plugin.load_plugins()
- import bzrlib.plugins.fastimport
- '
- 
- if ! "$PYTHON_PATH" -c "$cmd"; then
- 	echo "consider setting BZR_PLUGIN_PATH=$HOME/.bazaar/plugins" 1>&2
- 	skip_all='skipping remote-bzr tests; bzr-fastimport not available'
- 	test_done
- fi
- 
  check () {
  	(cd $1 &&
  	git log --format='%s' -1 &&
@@@ -136,103 -122,8 +122,103 @@@ test_expect_success 'special modes' 
    (cd gitrepo &&
    git cat-file -p HEAD:link > ../actual) &&
  
-   echo -n content > expected &&
+   printf content > expected &&
    test_cmp expected actual
  '
  
 +cat > expected <<EOF
 +100644 blob 54f9d6da5c91d556e6b54340b1327573073030af	content
 +100755 blob 68769579c3eaadbe555379b9c3538e6628bae1eb	executable
 +120000 blob 6b584e8ece562ebffc15d38808cd6b98fc3d97ea	link
 +040000 tree 35c0caa46693cef62247ac89a680f0c5ce32b37b	movedir-new
 +EOF
 +
 +test_expect_success 'moving directory' '
 +  (cd bzrrepo &&
 +  mkdir movedir &&
 +  echo one > movedir/one &&
 +  echo two > movedir/two &&
 +  bzr add movedir &&
 +  bzr commit -m movedir &&
 +  bzr mv movedir movedir-new &&
 +  bzr commit -m movedir-new) &&
 +
 +  (cd gitrepo &&
 +  git pull &&
 +  git ls-tree HEAD > ../actual) &&
 +
 +  test_cmp expected actual
 +'
 +
 +test_expect_success 'different authors' '
 +  (cd bzrrepo &&
 +  echo john >> content &&
 +  bzr commit -m john \
 +    --author "Jane Rey <jrey@example.com>" \
 +    --author "John Doe <jdoe@example.com>") &&
 +
 +  (cd gitrepo &&
 +  git pull &&
 +  git show --format="%an <%ae>, %cn <%ce>" --quiet > ../actual) &&
 +
 +  echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" > expected &&
 +  test_cmp expected actual
 +'
 +
 +test_expect_success 'fetch utf-8 filenames' '
 +  mkdir -p tmp && cd tmp &&
 +  test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
 +
 +  export LC_ALL=en_US.UTF-8
 +
 +  (
 +  bzr init bzrrepo &&
 +  cd bzrrepo &&
 +
 +  echo test >> "áéíóú" &&
 +  bzr add "áéíóú" &&
 +  bzr commit -m utf-8
 +  ) &&
 +
 +  (
 +  git clone "bzr::$PWD/bzrrepo" gitrepo &&
 +  cd gitrepo &&
 +  git ls-files > ../actual
 +  ) &&
 +
 +  echo "\"\\303\\241\\303\\251\\303\\255\\303\\263\\303\\272\"" > expected &&
 +  test_cmp expected actual
 +'
 +
 +test_expect_success 'push utf-8 filenames' '
 +  mkdir -p tmp && cd tmp &&
 +  test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
 +
 +  export LC_ALL=en_US.UTF-8
 +
 +  (
 +  bzr init bzrrepo &&
 +  cd bzrrepo &&
 +
 +  echo one >> content &&
 +  bzr add content &&
 +  bzr commit -m one
 +  ) &&
 +
 +  (
 +  git clone "bzr::$PWD/bzrrepo" gitrepo &&
 +  cd gitrepo &&
 +
 +  echo test >> "áéíóú" &&
 +  git add "áéíóú" &&
 +  git commit -m utf-8 &&
 +
 +  git push
 +  ) &&
 +
 +  (cd bzrrepo && bzr ls > ../actual) &&
 +  echo -e "content\náéíóú" > expected &&
 +  test_cmp expected actual
 +'
 +
  test_done