examples/{embedding,multi-context}: add LICENSE blurb, cosmetics

sbinet · sbinet · commit e86515821a6b · 2022-02-12T19:15:43.000+01:00
Signed-off-by: Sebastien Binet &lt;binet@cern.ch&gt;
diff --git a/examples/embedding/lib/REPL-startup.py b/examples/embedding/lib/REPL-startup.py
@@ -1,4 +1,6 @@
-
+# Copyright 2022 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.
 
 # This file is called from main.go when in REPL mode		
 
diff --git a/examples/embedding/lib/mylib.py b/examples/embedding/lib/mylib.py
@@ -1,3 +1,7 @@
+# Copyright 2022 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.
+
 import mylib_go as _go
 
 PY_VERSION  = _go.PY_VERSION
@@ -47,5 +51,3 @@ def PrintItinerary(self):
             i += 1
             
         print("###  Made with %s " % self._libVers)
-
-        
diff --git a/examples/embedding/main_test.go b/examples/embedding/main_test.go
@@ -1,3 +1,7 @@
+// Copyright 2022 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.
+
 package main
 
 import (
@@ -9,8 +13,6 @@ import (
 	"testing"
 )
 
-const embeddingTestOutput = "testdata/embedding_out_golden.txt"
-
 var regen = flag.Bool("regen", false, "regenerate golden files")
 
 func TestEmbeddedExample(t *testing.T) {
@@ -25,33 +27,36 @@ func TestEmbeddedExample(t *testing.T) {
 	cmd := exec.Command("go", "build", "-o", exe, ".")
 	err = cmd.Run()
 	if err != nil {
-		t.Fatalf("failed to compile embedding example: %v", err)
+		t.Fatalf("failed to compile embedding example: %+v", err)
 	}
 
 	out := new(bytes.Buffer)
 	cmd = exec.Command(exe, "mylib-demo.py")
 	cmd.Stdout = out
+	cmd.Stderr = out
 
 	err = cmd.Run()
 	if err != nil {
-		t.Fatalf("failed to run embedding binary: %v", err)
+		t.Fatalf("failed to run embedding binary: %+v", err)
 	}
 
-	testOutput := out.Bytes()
+	const fname = "testdata/embedding_out_golden.txt"
+
+	got := out.Bytes()
 
 	flag.Parse()
 	if *regen {
-		err = os.WriteFile(embeddingTestOutput, testOutput, 0644)
+		err = os.WriteFile(fname, got, 0644)
 		if err != nil {
-			t.Fatalf("failed to write test output: %v", err)
+			t.Fatalf("could not write golden file: %+v", err)
 		}
 	}
 
-	mustMatch, err := os.ReadFile(embeddingTestOutput)
+	want, err := os.ReadFile(fname)
 	if err != nil {
-		t.Fatalf("failed read %q", embeddingTestOutput)
+		t.Fatalf("could not read golden file: %+v", err)
 	}
-	if !bytes.Equal(testOutput, mustMatch) {
-		t.Fatalf("embedded test output did not match accepted output from %q", embeddingTestOutput)
+	if !bytes.Equal(got, want) {
+		t.Fatalf("stdout differ:\ngot:\n%s\nwant:\n%s\n", got, want)
 	}
 }
diff --git a/examples/embedding/mylib-demo.py b/examples/embedding/mylib-demo.py
@@ -1,3 +1,7 @@
+# Copyright 2022 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.
+
 print('''
 Welcome to a gpython embedded example, 
     where your wildest Go-based python dreams come true!''')
diff --git a/examples/multi-context/main.go b/examples/multi-context/main.go
@@ -36,7 +36,6 @@ func main() {
 		// Give each trial a fresh start
 		runtime.GC()
 	}
-
 }
 
 var jobScript = `

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ func main() {`
`36`	`36`	`// Give each trial a fresh start`
`37`	`37`	`runtime.GC()`
`38`	`38`	`}`
`39`		`-`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	var jobScript = `