github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Refactor tests to match new versioned code structure

Browse Source
This commit is contained in:
Clayton Coleman
2016-12-11 15:59:34 -05:00
parent e5019de260
commit c5d755dbec
24 changed files with 287 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/api/v1/conversion_test.go
View File

@@ -24,7 +24,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
versioned "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/diff"
@@ -36,7 +36,7 @@ func TestPodLogOptions(t *testing.T) {
tailLines := int64(2)
limitBytes := int64(3)
versionedLogOptions := &metav1.PodLogOptions{
versionedLogOptions := &v1.PodLogOptions{
Container: "mycontainer",
Follow: true,
Previous: true,
@@ -71,7 +71,7 @@ func TestPodLogOptions(t *testing.T) {
// unversioned -> query params
{
actualParameters, err := codec.EncodeParameters(unversionedLogOptions, metav1.SchemeGroupVersion)
actualParameters, err := codec.EncodeParameters(unversionedLogOptions, v1.SchemeGroupVersion)
if err != nil {
t.Fatal(err)
}
@@ -82,7 +82,7 @@ func TestPodLogOptions(t *testing.T) {
// versioned -> query params
{
actualParameters, err := codec.EncodeParameters(versionedLogOptions, metav1.SchemeGroupVersion)
actualParameters, err := codec.EncodeParameters(versionedLogOptions, v1.SchemeGroupVersion)
if err != nil {
t.Fatal(err)
}
@@ -93,8 +93,8 @@ func TestPodLogOptions(t *testing.T) {
// query params -> versioned
{
convertedLogOptions := &metav1.PodLogOptions{}
err := codec.DecodeParameters(expectedParameters, metav1.SchemeGroupVersion, convertedLogOptions)
convertedLogOptions := &v1.PodLogOptions{}
err := codec.DecodeParameters(expectedParameters, v1.SchemeGroupVersion, convertedLogOptions)
if err != nil {
t.Fatal(err)
}
@@ -106,7 +106,7 @@ func TestPodLogOptions(t *testing.T) {
// query params -> unversioned
{
convertedLogOptions := &api.PodLogOptions{}
err := codec.DecodeParameters(expectedParameters, metav1.SchemeGroupVersion, convertedLogOptions)
err := codec.DecodeParameters(expectedParameters, v1.SchemeGroupVersion, convertedLogOptions)
if err != nil {
t.Fatal(err)
}
@@ -126,7 +126,7 @@ func TestPodSpecConversion(t *testing.T) {
i := &api.PodSpec{
ServiceAccountName: name,
}
v := metav1.PodSpec{}
v := v1.PodSpec{}
if err := api.Scheme.Convert(i, &v, nil); err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -140,7 +140,7 @@ func TestPodSpecConversion(t *testing.T) {
// Test v1 -> internal. Either DeprecatedServiceAccount, ServiceAccountName,
// or both should translate to ServiceAccountName. ServiceAccountName wins
// if both are set.
testCases := []*metav1.PodSpec{
testCases := []*v1.PodSpec{
// New
{ServiceAccountName: name},
// Alias
@@ -167,14 +167,14 @@ func TestResourceListConversion(t *testing.T) {
bigMilliQuantity.Add(resource.MustParse("12345m"))
tests := []struct {
input metav1.ResourceList
input v1.ResourceList
expected api.ResourceList
}{
{ // No changes necessary.
input: metav1.ResourceList{
metav1.ResourceMemory: resource.MustParse("30M"),
metav1.ResourceCPU: resource.MustParse("100m"),
metav1.ResourceStorage: resource.MustParse("1G"),
input: v1.ResourceList{
v1.ResourceMemory: resource.MustParse("30M"),
v1.ResourceCPU: resource.MustParse("100m"),
v1.ResourceStorage: resource.MustParse("1G"),
},
expected: api.ResourceList{
api.ResourceMemory: resource.MustParse("30M"),
@@ -183,9 +183,9 @@ func TestResourceListConversion(t *testing.T) {
},
},
{ // Nano-scale values should be rounded up to milli-scale.
input: metav1.ResourceList{
metav1.ResourceCPU: resource.MustParse("3.000023m"),
metav1.ResourceMemory: resource.MustParse("500.000050m"),
input: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("3.000023m"),
v1.ResourceMemory: resource.MustParse("500.000050m"),
},
expected: api.ResourceList{
api.ResourceCPU: resource.MustParse("4m"),
@@ -193,9 +193,9 @@ func TestResourceListConversion(t *testing.T) {
},
},
{ // Large values should still be accurate.
input: metav1.ResourceList{
metav1.ResourceCPU: *bigMilliQuantity.Copy(),
metav1.ResourceStorage: *bigMilliQuantity.Copy(),
input: v1.ResourceList{
v1.ResourceCPU: *bigMilliQuantity.Copy(),
v1.ResourceStorage: *bigMilliQuantity.Copy(),
},
expected: api.ResourceList{
api.ResourceCPU: *bigMilliQuantity.Copy(),