git p4 test: refactor marshal_dump

Pete Wyckoff · gitster · commit 798d598080a6 · 2012-07-05T23:22:00.000-07:00
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 &lt;pw@padd.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -155,11 +155,6 @@ test_expect_success 'clone bare' '`
`155`	`155`	`)`
`156`	`156`	`'`
`157`	`157`
`158`		`-marshal_dump() {`
`159`		`- what=$1`
`160`		`- "$PYTHON_PATH" -c 'import marshal, sys; d = marshal.load(sys.stdin); print d["'$what'"]'`
`161`		`-}`
`162`		`-`
`163`	`158`	`# Sleep a bit so that the top-most p4 change did not happen "now". Then`
`164`	`159`	`# import the repo and make sure that the initial import has the same time`
`165`	`160`	`# as the top-most change.`