Unskip previously skipped tests

Author: Shiva

dgraph/cmd/dgraphimport/import_test.go

@@ -63,7 +63,7 @@ const expectedSchema = `{
 }`
 
 func TestDrainModeAfterStartSnapshotStream(t *testing.T) {
-	t.Skip("Skipping... sometimes the query for schema succeeds even when the server is in draining mode")
+	// t.Skip("Skipping... sometimes the query for schema succeeds even when the server is in draining mode")
 
 	tests := []struct {
 		name        string
@@ -111,7 +111,7 @@ func TestDrainModeAfterStartSnapshotStream(t *testing.T) {
 }
 
 func TestImportApis(t *testing.T) {
-	t.Skip("Skipping import tests due to persistent flakiness with container networking and Raft leadership issues")
+	// t.Skip("Skipping import tests due to persistent flakiness with container networking and Raft leadership issues")
 
 	tests := []testcase{
 		{

dgraphtest/load.go

@@ -580,8 +580,8 @@ func downloadFile(fname, url string) error {
 	cmd := exec.Command("wget", "-O", fname, url)
 	cmd.Dir = datasetFilesPath
 
-	if out, err := cmd.CombinedOutput(); err != nil {
-		return fmt.Errorf("error downloading file %s: %s", fname, string(out))
+	if _, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("error downloading file %s: %s", fname, err.Error())
 	}
 	return nil
 }

dgraphtest/local_cluster.go

@@ -930,8 +930,7 @@ func (c *LocalCluster) Client() (*dgraphapi.GrpcClient, func(), error) {
 	var conns []*grpc.ClientConn
 	for _, aa := range c.alphas {
 		if !aa.isRunning {
-			// QUESTIONS(shivaji): Should this be 'continue' instead of a break from the loop
-			break
+			continue
 		}
 		url, err := aa.alphaURL(c)
 		if err != nil {