Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b4c87a94
Commit
b4c87a94
authored
Dec 16, 2016
by
Joe Finney
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove two zany unit tests.
parent
d381ff42
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
329 deletions
+2
-329
BUILD
pkg/util/codeinspector/BUILD
+0
-18
codeinspector.go
pkg/util/codeinspector/codeinspector.go
+0
-96
BUILD
plugin/pkg/scheduler/algorithm/predicates/BUILD
+1
-7
predicates_test.go
plugin/pkg/scheduler/algorithm/predicates/predicates_test.go
+0
-83
BUILD
plugin/pkg/scheduler/algorithm/priorities/BUILD
+1
-8
priorities_test.go
plugin/pkg/scheduler/algorithm/priorities/priorities_test.go
+0
-117
No files found.
pkg/util/codeinspector/BUILD
deleted
100644 → 0
View file @
d381ff42
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = ["codeinspector.go"],
tags = ["automanaged"],
deps = [
"//vendor:k8s.io/gengo/parser",
"//vendor:k8s.io/gengo/types",
],
)
pkg/util/codeinspector/codeinspector.go
deleted
100644 → 0
View file @
d381ff42
/*
Copyright 2016 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
codeinspector
import
(
"fmt"
"go/ast"
"go/parser"
"go/token"
"io/ioutil"
"strings"
"unicode"
go2idlparser
"k8s.io/gengo/parser"
"k8s.io/gengo/types"
)
// GetPublicFunctions lists all public functions (not methods) from a golang source file.
func
GetPublicFunctions
(
pkg
,
filePath
string
)
([]
*
types
.
Type
,
error
)
{
builder
:=
go2idlparser
.
New
()
data
,
err
:=
ioutil
.
ReadFile
(
filePath
)
if
err
!=
nil
{
return
nil
,
err
}
if
err
:=
builder
.
AddFile
(
pkg
,
filePath
,
data
);
err
!=
nil
{
return
nil
,
err
}
universe
,
err
:=
builder
.
FindTypes
()
if
err
!=
nil
{
return
nil
,
err
}
var
functions
[]
*
types
.
Type
// Create the AST by parsing src.
fset
:=
token
.
NewFileSet
()
// positions are relative to fset
f
,
err
:=
parser
.
ParseFile
(
fset
,
filePath
,
nil
,
0
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"failed parse file to list functions: %v"
,
err
)
}
// Inspect the AST and print all identifiers and literals.
ast
.
Inspect
(
f
,
func
(
n
ast
.
Node
)
bool
{
var
s
string
switch
x
:=
n
.
(
type
)
{
case
*
ast
.
FuncDecl
:
s
=
x
.
Name
.
Name
// It's a function (not method), and is public, record it.
if
x
.
Recv
==
nil
&&
isPublic
(
s
)
{
functions
=
append
(
functions
,
universe
[
pkg
]
.
Function
(
x
.
Name
.
Name
))
}
}
return
true
})
return
functions
,
nil
}
// isPublic checks if a given string is a public function name.
func
isPublic
(
myString
string
)
bool
{
a
:=
[]
rune
(
myString
)
a
[
0
]
=
unicode
.
ToUpper
(
a
[
0
])
return
myString
==
string
(
a
)
}
// GetSourceCodeFiles lists golang source code files from directory, excluding sub-directory and tests files.
func
GetSourceCodeFiles
(
dir
string
)
([]
string
,
error
)
{
files
,
err
:=
ioutil
.
ReadDir
(
dir
)
if
err
!=
nil
{
return
nil
,
err
}
var
filenames
[]
string
for
_
,
file
:=
range
files
{
if
strings
.
HasSuffix
(
file
.
Name
(),
".go"
)
&&
!
strings
.
HasSuffix
(
file
.
Name
(),
"_test.go"
)
{
filenames
=
append
(
filenames
,
file
.
Name
())
}
}
return
filenames
,
nil
}
plugin/pkg/scheduler/algorithm/predicates/BUILD
View file @
b4c87a94
...
@@ -39,19 +39,13 @@ go_test(
...
@@ -39,19 +39,13 @@ go_test(
"utils_test.go",
"utils_test.go",
],
],
library = "go_default_library",
library = "go_default_library",
tags = [
tags = ["automanaged"],
"automanaged",
"skip",
],
deps = [
deps = [
"//pkg/api/resource:go_default_library",
"//pkg/api/resource:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/labels: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:go_default_library",
"//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
"//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
"//plugin/pkg/scheduler/schedulercache:go_default_library",
"//plugin/pkg/scheduler/schedulercache:go_default_library",
"//vendor:k8s.io/gengo/parser",
"//vendor:k8s.io/gengo/types",
],
],
)
)
plugin/pkg/scheduler/algorithm/predicates/predicates_test.go
View file @
b4c87a94
...
@@ -18,17 +18,12 @@ package predicates
...
@@ -18,17 +18,12 @@ package predicates
import
(
import
(
"fmt"
"fmt"
"os/exec"
"path/filepath"
"reflect"
"reflect"
"strings"
"strings"
"testing"
"testing"
"k8s.io/gengo/parser"
"k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/util/codeinspector"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
priorityutil
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
priorityutil
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
...
@@ -1849,84 +1844,6 @@ func TestEBSVolumeCountConflicts(t *testing.T) {
...
@@ -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
{
func
newPodWithPort
(
hostPorts
...
int
)
*
v1
.
Pod
{
networkPorts
:=
[]
v1
.
ContainerPort
{}
networkPorts
:=
[]
v1
.
ContainerPort
{}
for
_
,
port
:=
range
hostPorts
{
for
_
,
port
:=
range
hostPorts
{
...
...
plugin/pkg/scheduler/algorithm/priorities/BUILD
View file @
b4c87a94
...
@@ -52,26 +52,19 @@ go_test(
...
@@ -52,26 +52,19 @@ go_test(
"node_affinity_test.go",
"node_affinity_test.go",
"node_label_test.go",
"node_label_test.go",
"node_prefer_avoid_pods_test.go",
"node_prefer_avoid_pods_test.go",
"priorities_test.go",
"selector_spreading_test.go",
"selector_spreading_test.go",
"taint_toleration_test.go",
"taint_toleration_test.go",
],
],
library = "go_default_library",
library = "go_default_library",
tags = [
tags = ["automanaged"],
"automanaged",
"skip",
],
deps = [
deps = [
"//pkg/api/resource:go_default_library",
"//pkg/api/resource:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/meta/v1: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:go_default_library",
"//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
"//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
"//plugin/pkg/scheduler/api:go_default_library",
"//plugin/pkg/scheduler/api:go_default_library",
"//plugin/pkg/scheduler/schedulercache:go_default_library",
"//plugin/pkg/scheduler/schedulercache:go_default_library",
"//vendor:k8s.io/gengo/parser",
"//vendor:k8s.io/gengo/types",
],
],
)
)
plugin/pkg/scheduler/algorithm/priorities/priorities_test.go
deleted
100644 → 0
View file @
d381ff42
/*
Copyright 2014 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
priorities
import
(
"fmt"
"os/exec"
"path/filepath"
"testing"
"k8s.io/gengo/parser"
"k8s.io/gengo/types"
"k8s.io/kubernetes/pkg/util/codeinspector"
)
func
getPrioritySignatures
()
([]
*
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
}
signatures
:=
[]
string
{
"PriorityFunction"
,
"PriorityMapFunction"
,
"PriorityReduceFunction"
}
results
:=
make
([]
*
types
.
Signature
,
0
,
len
(
signatures
))
for
_
,
signature
:=
range
signatures
{
result
,
ok
:=
universe
[
pkgName
]
.
Types
[
signature
]
if
!
ok
{
return
nil
,
fmt
.
Errorf
(
"%s type not defined"
,
signature
)
}
results
=
append
(
results
,
result
.
Signature
)
}
return
results
,
nil
}
func
TestPrioritiesRegistered
(
t
*
testing
.
T
)
{
var
functions
[]
*
types
.
Type
// Files and directories which priorities may be referenced
targetFiles
:=
[]
string
{
"./../../algorithmprovider/defaults/defaults.go"
,
// Default algorithm
"./../../factory/plugins.go"
,
// Registered in init()
}
// List all golang source files under ./priorities/, 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 priorities in files.
for
_
,
filePath
:=
range
files
{
fileFunctions
,
err
:=
codeinspector
.
GetPublicFunctions
(
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities"
,
filePath
)
if
err
==
nil
{
functions
=
append
(
functions
,
fileFunctions
...
)
}
else
{
t
.
Errorf
(
"unexpected error when parsing %s: %v"
,
filePath
,
err
)
}
}
prioritySignatures
,
err
:=
getPrioritySignatures
()
if
err
!=
nil
{
t
.
Fatalf
(
"Couldn't get priorities signatures"
)
}
// Check if all public priorities are referenced in target files.
for
_
,
function
:=
range
functions
{
// Ignore functions that don't match priorities signatures.
signature
:=
function
.
Underlying
.
Signature
match
:=
false
for
_
,
prioritySignature
:=
range
prioritySignatures
{
if
len
(
prioritySignature
.
Parameters
)
!=
len
(
signature
.
Parameters
)
{
continue
}
if
len
(
prioritySignature
.
Results
)
!=
len
(
signature
.
Results
)
{
continue
}
// TODO: Check exact types of parameters and results.
match
=
true
}
if
!
match
{
continue
}
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
(
"priority %s is implemented as public but seems not registered or used in any other place"
,
function
.
Name
)
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment