[PATCH 2/3] git p4 test: refactor marshal_dump

From

PWPete Wyckoff <pw@padd.com>

Date

Jul 4, 2012, 13:34 UTC

Message-ID

<1341408860-26965-3-git-send-email-pw@padd.com>

In-Reply-To

<1341408860-26965-1-git-send-email-pw@padd.com>

Signed-off-by: Pete Wyckoff <pw@padd.com>
---
 t/lib-git-p4.sh         | 14 ++++++++++++++
 t/t9800-git-p4-basic.sh |  5 -----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 31d75ae..080b2c1 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -102,3 +102,17 @@ 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 07c2e15..b7ad716 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.

-- 
1.7.11.1.125.g4a65fea