Remove two zany unit tests.

CookedSashimi · Dec 16, 2016 · b4c87a9 · b4c87a9
1 parent d381ff4
commit b4c87a9
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 329 deletions.
diff --git a/pkg/util/codeinspector/BUILD b/pkg/util/codeinspector/BUILD
diff --git a/pkg/util/codeinspector/codeinspector.go b/pkg/util/codeinspector/codeinspector.go
diff --git a/plugin/pkg/scheduler/algorithm/predicates/BUILD b/plugin/pkg/scheduler/algorithm/predicates/BUILD
@@ -39,19 +39,13 @@ go_test(
         "utils_test.go",
     ],
     library = "go_default_library",
-    tags = [
-        "automanaged",
-        "skip",
-    ],
+    tags = ["automanaged"],
     deps = [
         "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/labels:go_default_library",
-        "//pkg/util/codeinspector:go_default_library",
         "//plugin/pkg/scheduler/algorithm:go_default_library",
         "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
         "//plugin/pkg/scheduler/schedulercache:go_default_library",
-        "//vendor:k8s.io/gengo/parser",
-        "//vendor:k8s.io/gengo/types",
     ],
 )
diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go b/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go
@@ -18,17 +18,12 @@ package predicates
 
 import (
 	"fmt"
-	"os/exec"
-	"path/filepath"
 	"reflect"
 	"strings"
 	"testing"
 
-	"k8s.io/gengo/parser"
-	"k8s.io/gengo/types"
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/util/codeinspector"
 	"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
 	priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
 	"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
@@ -1849,84 +1844,6 @@ func TestEBSVolumeCountConflicts(t *testing.T) {
 	}
 }
 
-func getPredicateSignature() (*types.Signature, error) {
-	filePath := "./../types.go"
-	pkgName := filepath.Dir(filePath)
-	builder := parser.New()
-	if err := builder.AddDir(pkgName); err != nil {
-		return nil, err
-	}
-	universe, err := builder.FindTypes()
-	if err != nil {
-		return nil, err
-	}
-	result, ok := universe[pkgName].Types["FitPredicate"]
-	if !ok {
-		return nil, fmt.Errorf("FitPredicate type not defined")
-	}
-	return result.Signature, nil
-}
-
-func TestPredicatesRegistered(t *testing.T) {
-	var functions []*types.Type
-
-	// Files and directories which predicates may be referenced
-	targetFiles := []string{
-		"./../../algorithmprovider/defaults/defaults.go", // Default algorithm
-		"./../../factory/plugins.go",                     // Registered in init()
-		"./../../../../../pkg/",                          // kubernetes/pkg, often used by kubelet or controller
-	}
-
-	// List all golang source files under ./predicates/, excluding test files and sub-directories.
-	files, err := codeinspector.GetSourceCodeFiles(".")
-
-	if err != nil {
-		t.Errorf("unexpected error: %v when listing files in current directory", err)
-	}
-
-	// Get all public predicates in files.
-	for _, filePath := range files {
-		fileFunctions, err := codeinspector.GetPublicFunctions("k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates", filePath)
-		if err == nil {
-			functions = append(functions, fileFunctions...)
-		} else {
-			t.Errorf("unexpected error %s when parsing %s", err, filePath)
-		}
-	}
-
-	predSignature, err := getPredicateSignature()
-	if err != nil {
-		t.Fatalf("Couldn't get predicates signature")
-	}
-
-	// Check if all public predicates are referenced in target files.
-	for _, function := range functions {
-		// Ignore functions that don't match FitPredicate signature.
-		signature := function.Underlying.Signature
-		if len(predSignature.Parameters) != len(signature.Parameters) {
-			continue
-		}
-		if len(predSignature.Results) != len(signature.Results) {
-			continue
-		}
-		// TODO: Check exact types of parameters and results.
-
-		args := []string{"-rl", function.Name.Name}
-		args = append(args, targetFiles...)
-
-		err := exec.Command("grep", args...).Run()
-		if err != nil {
-			switch err.Error() {
-			case "exit status 2":
-				t.Errorf("unexpected error when checking %s", function.Name)
-			case "exit status 1":
-				t.Errorf("predicate %s is implemented as public but seems not registered or used in any other place",
-					function.Name)
-			}
-		}
-	}
-}
-
 func newPodWithPort(hostPorts ...int) *v1.Pod {
 	networkPorts := []v1.ContainerPort{}
 	for _, port := range hostPorts {

diff --git a/plugin/pkg/scheduler/algorithm/priorities/BUILD b/plugin/pkg/scheduler/algorithm/priorities/BUILD
@@ -52,26 +52,19 @@ go_test(
         "node_affinity_test.go",
         "node_label_test.go",
         "node_prefer_avoid_pods_test.go",
-        "priorities_test.go",
         "selector_spreading_test.go",
         "taint_toleration_test.go",
     ],
     library = "go_default_library",
-    tags = [
-        "automanaged",
-        "skip",
-    ],
+    tags = ["automanaged"],
     deps = [
         "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
-        "//pkg/util/codeinspector:go_default_library",
         "//plugin/pkg/scheduler/algorithm:go_default_library",
         "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
         "//plugin/pkg/scheduler/api:go_default_library",
         "//plugin/pkg/scheduler/schedulercache:go_default_library",
-        "//vendor:k8s.io/gengo/parser",
-        "//vendor:k8s.io/gengo/types",
     ],
 )
diff --git a/plugin/pkg/scheduler/algorithm/priorities/priorities_test.go b/plugin/pkg/scheduler/algorithm/priorities/priorities_test.go