bind: test for tp_call

Change-Id: Ibd4db613a7ba2256a195e79ad66314cad1aea40a

_examples/funcs/funcs.go

@@ -4,6 +4,10 @@
 
 package funcs
 
+import (
+	"github.com/go-python/gopy/_examples/cpkg"
+)
+
 var (
 	F1 func()
 	F2 Func
@@ -28,3 +32,13 @@ type S2 struct {
 	F2 []func()
 	F3 [5]func()
 }
+
+func init() {
+	F1 = func() {
+		cpkg.Printf("calling F1\n")
+	}
+
+	F2 = Func(func() {
+		cpkg.Printf("calling F2\n")
+	})
+}

_examples/funcs/test.py

@@ -0,0 +1,29 @@
+# Copyright 2015 The go-python Authors.  All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+## py2/py3 compat
+from __future__ import print_function
+
+import funcs
+
+print("funcs.GetF1()...")
+f1 = funcs.GetF1()
+print("f1()= %s" % f1())
+
+print("funcs.GetF2()...")
+f2 = funcs.GetF2()
+print("f2()= %s" % f2())
+
+print("s1 = funcs.S1()...")
+s1 = funcs.S1()
+print("s1.F1 = funcs.GetF2()...")
+s1.F1 = funcs.GetF2()
+print("s1.F1() = %s" % s1.F1())
+
+print("s2 = funcs.S2()...")
+s2 = funcs.S2()
+print("s2.F1 = funcs.GetF1()...")
+s2.F1 = funcs.GetF1()
+print("s2.F1() = %s" % s2.F1())
+

main_test.go

@@ -14,31 +14,33 @@ import (
 	"testing"
 )
 
-func TestBind(t *testing.T) {
-	// mk && rm -rf toto $TMPDIR/gopy-* && gopy bind -output=./toto ./_examples/hi && (echo "=== testing..."; cd toto; cp ../_examples/hi/test.py .; python2 ./test.py && echo "[ok]" || echo "ERR")
-	//
+type pkg struct {
+	path string
+	want []byte
+}
 
+func testPkg(t *testing.T, table pkg) {
 	workdir, err := ioutil.TempDir("", "gopy-")
 	if err != nil {
-		t.Fatalf("could not create workdir: %v\n", err)
+		t.Fatalf("[%s]: could not create workdir: %v\n", table.path, err)
 	}
 	err = os.MkdirAll(workdir, 0644)
 	if err != nil {
-		t.Fatalf("could not create workdir: %v\n", err)
+		t.Fatalf("[%s]: could not create workdir: %v\n", table.path, err)
 	}
 	defer os.RemoveAll(workdir)
 
-	cmd := exec.Command("gopy", "bind", "-output="+workdir, "./_examples/hi")
+	cmd := exec.Command("gopy", "bind", "-output="+workdir, "./"+table.path)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
 	if err != nil {
-		t.Fatalf("error running gopy-bind: %v\n", err)
+		t.Fatalf("[%s]: error running gopy-bind: %v\n", table.path, err)
 	}
 
 	cmd = exec.Command(
-		"/bin/cp", "./_examples/hi/test.py",
+		"/bin/cp", "./"+table.path+"/test.py",
 		filepath.Join(workdir, "test.py"),
 	)
 	cmd.Stdin = os.Stdin
@@ -46,10 +48,40 @@ func TestBind(t *testing.T) {
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()
 	if err != nil {
-		t.Fatalf("error copying 'test.py': %v\n", err)
+		t.Fatalf("[%s]: error copying 'test.py': %v\n", table.path, err)
 	}
 
-	want := []byte(`--- doc(hi)...
+	buf := new(bytes.Buffer)
+	cmd = exec.Command("python2", "./test.py")
+	cmd.Dir = workdir
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = buf
+	cmd.Stderr = buf
+	err = cmd.Run()
+	if err != nil {
+		t.Fatalf(
+			"[%s]: error running python module: %v\n%v\n",
+			table.path,
+			err,
+			string(buf.Bytes()),
+		)
+	}
+
+	if !reflect.DeepEqual(string(buf.Bytes()), string(table.want)) {
+		t.Fatalf("[%s]: error running python module:\nwant:\n%s\n\ngot:\n%s\n",
+			table.path,
+			string(table.want), string(buf.Bytes()),
+		)
+	}
+
+}
+
+func TestHi(t *testing.T) {
+	t.Parallel()
+
+	testPkg(t, pkg{
+		path: "_examples/hi",
+		want: []byte(`--- doc(hi)...
 package hi exposes a few Go functions to be wrapped and used from Python.
 
 --- hi.GetUniverse(): 42
@@ -155,24 +187,28 @@ slice[2]: caught: array index out of range
 slice: []int{1, 42}
 len(slice): 2
 mem(slice): 2
-`)
-	buf := new(bytes.Buffer)
-	cmd = exec.Command("python2", "./test.py")
-	cmd.Dir = workdir
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = buf
-	cmd.Stderr = buf
-	err = cmd.Run()
-	if err != nil {
-		t.Fatalf(
-			"error running python module: %v\n%v\n", err,
-			string(buf.Bytes()),
-		)
-	}
-
-	if !reflect.DeepEqual(string(buf.Bytes()), string(want)) {
-		t.Fatalf("error running python module:\nwant:\n%s\n\ngot:\n%s\n",
-			string(want), string(buf.Bytes()),
-		)
-	}
+`),
+	})
+}
+
+func TestBindFuncs(t *testing.T) {
+	t.Parallel()
+	testPkg(t, pkg{
+		path: "_examples/funcs",
+		want: []byte(`funcs.GetF1()...
+calling F1
+f1()= None
+funcs.GetF2()...
+calling F2
+f2()= None
+s1 = funcs.S1()...
+s1.F1 = funcs.GetF2()...
+calling F2
+s1.F1() = None
+s2 = funcs.S2()...
+s2.F1 = funcs.GetF1()...
+calling F1
+s2.F1() = None
+`),
+	})
 }