rebase

xichen2020 · Jan 28, 2019 · 97ffc5f · 97ffc5f
1 parent befd26e
commit 97ffc5f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/integration/fixtures.go b/integration/fixtures.go
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -49,9 +49,8 @@ func TestRawQueryOrderBy(t *testing.T) {
 		},
 	}
 	ts := newTestServerSetup(t, testConfig1, testData1)
-	// defer ts.close(t) // TODO(wjang): close() is panic-ing in storage/shard.go.
 	ts.startServer()
-	defer ts.stopServer(t)
+	defer ts.close(t)
 	ts.writeTestFixture(t)
 	client := ts.newClient()
 	require.NoError(t, ts.waitUntil(10*time.Second, client.serverIsHealthy))

diff --git a/integration/setup.go b/integration/setup.go
@@ -93,9 +93,7 @@ func (ts *testServerSetup) stopServer(t *testing.T) {
 
 func (ts *testServerSetup) stopDB(t *testing.T) {
 	// TODO(wjang): Delete the database files as well.
-	// TODO(wjang): Close() is panic-ing in storage/shard.go.
-	err := ts.db.Close()
-	require.NoError(t, err)
+	require.NoError(t, ts.db.Close())
 }
 
 func (ts *testServerSetup) close(t *testing.T) {