diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-07-04 09:34:19 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-05 23:22:00 -0700 |
| commit | 798d598080a68deb4958d69adacee409a23b467b (patch) | |
| tree | 9b09f5f8899b4f0e9c1917a7feaf1d02db6c44a1 | |
| parent | c47178d4f0d7331a75f8e0625fd2facd1b5fee4e (diff) | |
| download | git-798d598080a68deb4958d69adacee409a23b467b.tar.gz | |
git p4 test: refactor marshal_dump
This function will be useful in future tests. Move it to
the git-p4 test library. Let it accept an optional argument
to pick a certain marshaled object out of the input stream.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-git-p4.sh | 13 | ||||
| -rwxr-xr-x | t/t9800-git-p4-basic.sh | 5 |
2 files changed, 13 insertions, 5 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 31d75ae043..2d753ab7e1 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -102,3 +102,16 @@ cleanup_git() { rm -rf "$git" && mkdir "$git" } + +marshal_dump() { + what=$1 && + line=${2:-1} && + cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF && + import marshal + import sys + for i in range($line): + d = marshal.load(sys.stdin) + print d['$what'] + EOF + "$PYTHON_PATH" "$TRASH_DIRECTORY/marshal-dump.py" +} diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 07c2e157cb..b7ad716b09 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -155,11 +155,6 @@ test_expect_success 'clone bare' ' ) ' -marshal_dump() { - what=$1 - "$PYTHON_PATH" -c 'import marshal, sys; d = marshal.load(sys.stdin); print d["'$what'"]' -} - # Sleep a bit so that the top-most p4 change did not happen "now". Then # import the repo and make sure that the initial import has the same time # as the top-most change. |