importer/pinboard: kill World after test

Related: Issue #680

Change-Id: I10a1ffc611d159288b4dc9d52e96524bbb385ee1
This commit is contained in:
mpl 2016-02-13 00:44:09 +01:00
parent 6fd35bd4de
commit eb0db1f1ff
3 changed files with 5 additions and 5 deletions

View File

@ -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()
}

View File

@ -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

View File

@ -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)