fix test to support both python3 and python2

Author: disktnk

_test_go2py.py

@@ -5,6 +5,10 @@ def go2py_tostr(arg):
     return str(arg)
 
 
+def go2py_toutf8(arg):
+    return arg.decode('utf-8')
+
+
 def go2py_mapinmap(arg):
     ret = arg['string']
     ret += '_' + arg['map']['instr']

_test_new_instance.py

@@ -47,11 +47,11 @@ def get_instance2(a, b=5, **c):
         ins = PythonTest3()
         ins.a = a
         ins.b = b
-        ins.c = c
+        ins.c1 = c['v1']
         return ins
 
     def confirm(self):
-        return str(self.a) + '_' + str(self.b) + '_' + str(self.c)
+        return str(self.a) + '_' + str(self.b) + '_' + str(self.c1)
 
 
 class ChildClass(PythonTest3):
@@ -64,7 +64,10 @@ class PythonTestForKwd(object):
     def __init__(self, a, b=5, **c):
         self.a = a
         self.b = b
-        self.c = c
+        self.c = c['c'] if 'c' in c else ''
+        self.d = c['d'] if 'd' in c else ''
+        self.e = c['e'] if 'e' in c else ''
 
     def confirm_init(self):
-        return str(self.a) + '_' + str(self.b) + '_' + str(self.c)
+        return str(self.a) + '_' + str(self.b) + '_' + str(self.c) + '_' + \
+            str(self.d) + '_' + str(self.e)

func_test.go

@@ -1,10 +1,11 @@
 package py
 
 import (
+	"testing"
+
 	. "github.com/smartystreets/goconvey/convey"
 	"gopkg.in/sensorbee/py.v0/mainthread"
 	"gopkg.in/sensorbee/sensorbee.v0/data"
-	"testing"
 )
 
 func TestGetPyFuncError(t *testing.T) {
@@ -105,7 +106,8 @@ func TestPyFunc(t *testing.T) {
 			Convey("it should return an error.", func() {
 				So(err, ShouldNotBeNil)
 				So(ret2.p, ShouldBeNil)
-				So(err.Error(), ShouldContainSubstring, "__call__() missing 1 required positional argument")
+				So(err.Error(), ShouldContainSubstring, "TypeError:")
+				So(err.Error(), ShouldContainSubstring, "argument")
 			})
 		})
 

go2py_converter_test.go

@@ -2,11 +2,12 @@ package py
 
 import (
 	"fmt"
+	"testing"
+	"time"
+
 	. "github.com/smartystreets/goconvey/convey"
 	"gopkg.in/sensorbee/py.v0/mainthread"
 	"gopkg.in/sensorbee/sensorbee.v0/data"
-	"testing"
-	"time"
 )
 
 func TestConvertGo2PyObject(t *testing.T) {
@@ -17,17 +18,15 @@ func TestConvertGo2PyObject(t *testing.T) {
 		So(err, ShouldBeNil)
 		So(mdl, ShouldNotBeNil)
 
-		type argAndExpected struct {
-			arg      data.Value
-			expected string
-		}
-
 		Convey("When set an object", func() {
+			type argAndExpected struct {
+				arg      data.Value
+				expected string
+			}
 			values := map[string]argAndExpected{
 				"string": argAndExpected{data.String("test"), "test"},
 				"int":    argAndExpected{data.Int(9), "9"},
 				"float":  argAndExpected{data.Float(0.9), "0.9"},
-				"byte":   argAndExpected{data.Blob([]byte("ABC")), "b'ABC'"},
 				"true":   argAndExpected{data.True, "True"},
 				"false":  argAndExpected{data.False, "False"},
 				"null":   argAndExpected{data.Null{}, "None"},
@@ -41,9 +40,11 @@ func TestConvertGo2PyObject(t *testing.T) {
 					So(actual, ShouldEqual, v.expected)
 				})
 			}
+		})
 
-			Convey("Then function should return string value: time", func() {
-				now := time.Now().UTC()
+		Convey("When set a time value", func() {
+			now := time.Now().UTC()
+			Convey("Then function should return time as string type", func() {
 				actual, err := mdl.Call("go2py_tostr", data.Timestamp(now))
 				So(err, ShouldBeNil)
 				retStr, err := data.AsString(actual)
@@ -54,6 +55,15 @@ func TestConvertGo2PyObject(t *testing.T) {
 			})
 		})
 
+		Convey("When set a byte array", func() {
+			b := data.Blob([]byte("ABC"))
+			Convey("Then function should return string", func() {
+				actual, err := mdl.Call("go2py_toutf8", b)
+				So(err, ShouldBeNil)
+				So(actual, ShouldEqual, "ABC")
+			})
+		})
+
 		Convey("When set map in map and map in array", func() {
 			arg := data.Map{
 				"string": data.String("test"),

module_test.go

@@ -1,10 +1,11 @@
 package py
 
 import (
+	"testing"
+
 	. "github.com/smartystreets/goconvey/convey"
 	"gopkg.in/sensorbee/py.v0/mainthread"
 	"gopkg.in/sensorbee/sensorbee.v0/data"
-	"testing"
 )
 
 func TestLoadModuleError(t *testing.T) {
@@ -177,7 +178,7 @@ func TestNewInstanceAndStateness(t *testing.T) {
 				ins := &ObjectInstance{obj}
 				actual, err := ins.Call("confirm")
 				So(err, ShouldBeNil)
-				So(actual, ShouldEqual, "55_5_{'v1': 'homhom'}")
+				So(actual, ShouldEqual, "55_5_homhom")
 			})
 		})
 
@@ -249,7 +250,7 @@ func TestNewInstanceWithKeywordArgument(t *testing.T) {
 
 				actual, err := ins.Call("confirm_init")
 				So(err, ShouldBeNil)
-				So(actual, ShouldBeIn, []string{"1_2_{'c': 3, 'd': 4}", "1_2_{'d': 4, 'c': 3}"})
+				So(actual, ShouldEqual, "1_2_3_4_")
 			})
 		})
 
@@ -268,14 +269,14 @@ func TestNewInstanceWithKeywordArgument(t *testing.T) {
 
 				actual, err := ins.Call("confirm_init")
 				So(err, ShouldBeNil)
-				So(actual, ShouldEqual, "1_5_{}")
+				So(actual, ShouldEqual, "1_5___")
 			})
 		})
 
 		Convey("When get a new test python instance with named and non-named arguments mixed", func() {
 			arg := data.Int(1)
 			kwdArg := data.Map{
-				"v1": data.String("homhom"),
+				"e": data.String("homhom"),
 			}
 			ins, err := mdl.NewInstance("PythonTestForKwd", []data.Value{arg}, kwdArg)
 			Reset(func() {
@@ -288,7 +289,7 @@ func TestNewInstanceWithKeywordArgument(t *testing.T) {
 
 				actual, err := ins.Call("confirm_init")
 				So(err, ShouldBeNil)
-				So(actual, ShouldEqual, "1_5_{'v1': 'homhom'}")
+				So(actual, ShouldEqual, "1_5___homhom")
 			})
 		})
 

pystate/_test_creator_module.py

@@ -51,7 +51,7 @@ def create(*args, **params):
 
     @staticmethod
     def load(filepath, *args, **kwargs):
-        with open(filepath, 'r') as f:
+        with open(filepath, 'rb') as f:
             return six.moves.cPickle.load(f)
 
     def modify_params(self):
@@ -62,7 +62,7 @@ def confirm(self):
         return self.params
 
     def save(self, filepath, *args, **kwargs):
-        with open(filepath, 'w') as f:
+        with open(filepath, 'wb') as f:
             six.moves.cPickle.dump(self, f)