GODRIVER-3445 Cont. working on submodule integration

Author: prestonvasquez

internal/integration/unified/unified_spec_runner.go

@@ -90,6 +90,7 @@ func runTestDirectory(t *testing.T, directoryPath string, expectValidFail bool)
 
 // runTestFile runs the tests in the given file, with expectValidFail determining whether the tests should expect to pass or fail
 func runTestFile(t *testing.T, filepath string, expectValidFail bool, opts ...*Options) {
+	spectest.CheckSkip(t)
 	content, err := ioutil.ReadFile(filepath)
 	assert.Nil(t, err, "ReadFile error for file %q: %v", filepath, err)
 

internal/integration/unified/unified_spec_test.go

@@ -16,13 +16,14 @@ import (
 
 var (
 	passDirectories = []string{
-		//
-		//"load-balancers",
-		//
-		spectest.TestPath(3, "unified-test-format", "valid-pass"),
+
 		spectest.TestPath(3, "versioned-api"),
-		//spectest.TestPath(3, "crud", "unified"),
-		//spectest.TestPath(3, "change-streams", "unified"),
+		spectest.TestPath(3, "unified-test-format", "valid-pass"),
+		spectest.TestPath(3, "crud", "unified"),
+		spectest.TestPath(3, "change-streams", "unified"),
+
+		// TODO:
+		//"load-balancers",
 		//spectest.TestPath(3, "transactions", "unified"),
 		//spectest.TestPath(3, "collection-management"),
 		//spectest.TestPath(3, "command-logging-and-monitoring", "monitoring"),
@@ -32,23 +33,21 @@ var (
 		//spectest.TestPath(3, "sessions"),
 		//spectest.TestPath(3, "retryable-reads", "unified"),
 		//spectest.TestPath(3, "retryable-writes", "unified"),
-		//"client-side-encryption/unified",
-		//"client-side-operations-timeout",
-		//"gridfs",
-		//"server-selection/logging",
-		//"server-discovery-and-monitoring/unified",
-		//"run-command",
-		//"index-management",
+
+		spectest.TestPath(3, "client-side-encryption", "unified"),
+		spectest.TestPath(3, "client-side-operations-timeout"),
+		spectest.TestPath(3, "gridfs"),
+		spectest.TestPath(3, "server-selection", "logging"),
+		spectest.TestPath(3, "server-discovery-and-monitoring", "unified"),
+		spectest.TestPath(3, "run-command", "unified"),
+		spectest.TestPath(3, "index-management"),
 	}
 	failDirectories = []string{
+		// TODO:
 		//"unified-test-format/valid-fail",
 	}
 )
 
-//const (
-//	dataDirectory = "../../../testdata"
-//)
-
 func TestUnifiedSpec(t *testing.T) {
 	// Ensure the cluster is in a clean state before test execution begins.
 	if err := terminateOpenSessions(context.Background()); err != nil {