From eb0db1f1ff73a51262c815dc127dcdc8d9492430 Mon Sep 17 00:00:00 2001
From: mpl <mathieu.lonjaret@gmail.com>
Date: Sat, 13 Feb 2016 00:44:09 +0100
Subject: [PATCH] importer/pinboard: kill World after test

Related: Issue #680

Change-Id: I10a1ffc611d159288b4dc9d52e96524bbb385ee1
---
 make.go                                | 7 ++++---
 pkg/importer/pinboard/pinboard_test.go | 1 +
 pkg/test/world.go                      | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/make.go b/make.go
index 4ed16dbc8..e4e74f19e 100644
--- a/make.go
+++ b/make.go
@@ -112,6 +112,10 @@ func main() {
 		latestSrcMod = mirror(sql)
 		if *onlysync {
 			mirrorFile("make.go", filepath.Join(buildSrcDir, "make.go"))
+			// Since we have not done the resources embedding, the
+			// z_*.go files have not been marked as wanted and are
+			// going to be removed. And they will have to be
+			// regenerated next time make.go is run.
 			deleteUnwantedOldMirrorFiles(buildSrcDir, true)
 			fmt.Println(buildGoPath)
 			return
@@ -158,9 +162,6 @@ func main() {
 
 	withCamlistored := stringListContains(targs, "camlistore.org/server/camlistored")
 	if *embedResources && withCamlistored {
-		// TODO(mpl): it looks like we always regenerate the
-		// zembed.*.go, at least for the integration
-		// tests. I'll look into it.
 		doEmbed()
 	}
 
diff --git a/pkg/importer/pinboard/pinboard_test.go b/pkg/importer/pinboard/pinboard_test.go
index 5eb696aaf..a0dc87979 100644
--- a/pkg/importer/pinboard/pinboard_test.go
+++ b/pkg/importer/pinboard/pinboard_test.go
@@ -94,6 +94,7 @@ func TestIntegrationRun(t *testing.T) {
 	const attrValue = "value"
 
 	w := test.GetWorld(t)
+	defer w.Stop()
 	baseURL := w.ServerBaseURL()
 
 	// TODO(mpl): add a utility in integration package to provide a client that
diff --git a/pkg/test/world.go b/pkg/test/world.go
index b3c4b79f1..c2a521e97 100644
--- a/pkg/test/world.go
+++ b/pkg/test/world.go
@@ -120,8 +120,6 @@ func (w *World) Start() error {
 			"camtool",
 			"camlistored",
 		}
-		// TODO(mpl): investigate why we still rebuild camlistored everytime if run through devcam test.
-		// it looks like it's because we always resync the UI files and hence redo the embeds. Next CL.
 		var latestModtime time.Time
 		for _, target := range targs {
 			binPath := filepath.Join(w.camRoot, "bin", target)