From d0ac3ffd9da8d1c3e629129030f74e1927faf575 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Wed, 28 Nov 2012 23:11:00 +0100 Subject: [PATCH] Rename git-remote-testgit to git-remote-testpy This script is not really exercising the remote-helper functionality, but more the python framework for remote helpers that live in git_remote_helpers. It's also not a good example of how to write remote-helpers, unless you are planning to use python, and even then you might not want to use this framework. So let's use a more appropriate name: git-remote-testpy. A patch that replaces git-remote-testgit with a simpler version is on the way. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- .gitignore | 2 +- Makefile | 2 +- git-remote-testgit.py => git-remote-testpy.py | 0 ...00-remote-helpers.sh => t5800-remote-testpy.sh} | 14 +++++++------- 4 files changed, 9 insertions(+), 9 deletions(-) rename git-remote-testgit.py => git-remote-testpy.py (100%) rename t/{t5800-remote-helpers.sh => t5800-remote-testpy.sh} (87%) diff --git a/.gitignore b/.gitignore index f702415c1..956ae2260 100644 --- a/.gitignore +++ b/.gitignore @@ -124,7 +124,7 @@ /git-remote-ftps /git-remote-fd /git-remote-ext -/git-remote-testgit +/git-remote-testpy /git-remote-testsvn /git-repack /git-replace diff --git a/Makefile b/Makefile index 9bc5e4036..68f1ac288 100644 --- a/Makefile +++ b/Makefile @@ -470,7 +470,7 @@ SCRIPT_PERL += git-relink.perl SCRIPT_PERL += git-send-email.perl SCRIPT_PERL += git-svn.perl -SCRIPT_PYTHON += git-remote-testgit.py +SCRIPT_PYTHON += git-remote-testpy.py SCRIPT_PYTHON += git-p4.py SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ diff --git a/git-remote-testgit.py b/git-remote-testpy.py similarity index 100% rename from git-remote-testgit.py rename to git-remote-testpy.py diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-testpy.sh similarity index 87% rename from t/t5800-remote-helpers.sh rename to t/t5800-remote-testpy.sh index d46fa406f..675096150 100755 --- a/t/t5800-remote-helpers.sh +++ b/t/t5800-remote-testpy.sh @@ -3,12 +3,12 @@ # Copyright (c) 2010 Sverre Rabbelier # -test_description='Test remote-helper import and export commands' +test_description='Test python remote-helper framework' . ./test-lib.sh if ! test_have_prereq PYTHON ; then - skip_all='skipping remote-testgit tests, python not available' + skip_all='skipping python remote-helper tests, python not available' test_done fi @@ -17,7 +17,7 @@ import sys if sys.hexversion < 0x02040000: sys.exit(1) ' || { - skip_all='skipping remote-testgit tests, python version < 2.4' + skip_all='skipping python remote-helper tests, python version < 2.4' test_done } @@ -38,12 +38,12 @@ test_expect_success 'setup repository' ' ' test_expect_success 'cloning from local repo' ' - git clone "testgit::${PWD}/server" localclone && + git clone "testpy::${PWD}/server" localclone && test_cmp public/file localclone/file ' test_expect_success 'cloning from remote repo' ' - git clone "testgit::file://${PWD}/server" clone && + git clone "testpy::file://${PWD}/server" clone && test_cmp public/file clone/file ' @@ -73,11 +73,11 @@ test_expect_success 'pushing to local repo' ' ' # Generally, skip this test. It demonstrates a now-fixed race in -# git-remote-testgit, but is too slow to leave in for general use. +# git-remote-testpy, but is too slow to leave in for general use. : test_expect_success 'racily pushing to local repo' ' test_when_finished "rm -rf server2 localclone2" && cp -R server server2 && - git clone "testgit::${PWD}/server2" localclone2 && + git clone "testpy::${PWD}/server2" localclone2 && (cd localclone2 && echo content >>file && git commit -a -m three && -- 2.26.2