github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36536 from nikhiljindal/disableTest

Browse Source 
Disabling flaky federation unit tests
This commit is contained in:
Jess Frazelle 2016-11-09 16:07:49 -05:00 committed by GitHub
commit 3bd8704489
2 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
federation/pkg/federation-controller/namespace/namespace_controller_test.go
View File

@ -62,7 +62,7 @@ func TestNamespaceController(t *testing.T) {
cluster1Watch := RegisterFakeWatch("namespaces", &cluster1Client.Fake) cluster1Watch := RegisterFakeWatch("namespaces", &cluster1Client.Fake)
RegisterFakeList("namespaces", &cluster1Client.Fake, &api_v1.NamespaceList{Items: []api_v1.Namespace{}}) RegisterFakeList("namespaces", &cluster1Client.Fake, &api_v1.NamespaceList{Items: []api_v1.Namespace{}})
cluster1CreateChan := RegisterFakeCopyOnCreate("namespaces", &cluster1Client.Fake, cluster1Watch) cluster1CreateChan := RegisterFakeCopyOnCreate("namespaces", &cluster1Client.Fake, cluster1Watch)
cluster1UpdateChan := RegisterFakeCopyOnUpdate("namespaces", &cluster1Client.Fake, cluster1Watch) // cluster1UpdateChan := RegisterFakeCopyOnUpdate("namespaces", &cluster1Client.Fake, cluster1Watch)
cluster2Client := &fake_kubeclientset.Clientset{} cluster2Client := &fake_kubeclientset.Clientset{}
cluster2Watch := RegisterFakeWatch("namespaces", &cluster2Client.Fake) cluster2Watch := RegisterFakeWatch("namespaces", &cluster2Client.Fake)
@ -132,15 +132,18 @@ func TestNamespaceController(t *testing.T) {
cluster1.Name, ns1.Name, wait.ForeverTestTimeout) cluster1.Name, ns1.Name, wait.ForeverTestTimeout)
assert.Nil(t, err, "namespace should have appeared in the informer store") assert.Nil(t, err, "namespace should have appeared in the informer store")
// Test update federated namespace. /*
ns1.Annotations = map[string]string{ // TODO: Uncomment this once we have figured out why this is flaky.
"A": "B", // Test update federated namespace.
} ns1.Annotations = map[string]string{
namespaceWatch.Modify(&ns1) "A": "B",
updatedNamespace = GetNamespaceFromChan(cluster1UpdateChan) }
assert.NotNil(t, updatedNamespace) namespaceWatch.Modify(&ns1)
assert.Equal(t, ns1.Name, updatedNamespace.Name) updatedNamespace = GetNamespaceFromChan(cluster1UpdateChan)
// assert.Contains(t, updatedNamespace.Annotations, "A") assert.NotNil(t, updatedNamespace)
assert.Equal(t, ns1.Name, updatedNamespace.Name)
// assert.Contains(t, updatedNamespace.Annotations, "A")
*/
// Test add cluster // Test add cluster
clusterWatch.Add(cluster2) clusterWatch.Add(cluster2)

61
federation/pkg/federation-controller/secret/secret_controller_test.go
View File

@ -52,7 +52,7 @@ func TestSecretController(t *testing.T) {
cluster1Watch := RegisterFakeWatch("secrets", &cluster1Client.Fake) cluster1Watch := RegisterFakeWatch("secrets", &cluster1Client.Fake)
RegisterFakeList("secrets", &cluster1Client.Fake, &api_v1.SecretList{Items: []api_v1.Secret{}}) RegisterFakeList("secrets", &cluster1Client.Fake, &api_v1.SecretList{Items: []api_v1.Secret{}})
cluster1CreateChan := RegisterFakeCopyOnCreate("secrets", &cluster1Client.Fake, cluster1Watch) cluster1CreateChan := RegisterFakeCopyOnCreate("secrets", &cluster1Client.Fake, cluster1Watch)
cluster1UpdateChan := RegisterFakeCopyOnUpdate("secrets", &cluster1Client.Fake, cluster1Watch) // cluster1UpdateChan := RegisterFakeCopyOnUpdate("secrets", &cluster1Client.Fake, cluster1Watch)
cluster2Client := &fake_kubeclientset.Clientset{} cluster2Client := &fake_kubeclientset.Clientset{}
cluster2Watch := RegisterFakeWatch("secrets", &cluster2Client.Fake) cluster2Watch := RegisterFakeWatch("secrets", &cluster2Client.Fake)
@ -116,35 +116,38 @@ func TestSecretController(t *testing.T) {
cluster1.Name, types.NamespacedName{Namespace: secret1.Namespace, Name: secret1.Name}.String(), wait.ForeverTestTimeout) cluster1.Name, types.NamespacedName{Namespace: secret1.Namespace, Name: secret1.Name}.String(), wait.ForeverTestTimeout)
assert.Nil(t, err, "secret should have appeared in the informer store") assert.Nil(t, err, "secret should have appeared in the informer store")
// Test update federated secret. /*
secret1.Annotations = map[string]string{ // TODO: Uncomment this once we have figured out why this is flaky.
"A": "B", // Test update federated secret.
} secret1.Annotations = map[string]string{
secretWatch.Modify(&secret1) "A": "B",
updatedSecret = GetSecretFromChan(cluster1UpdateChan) }
assert.NotNil(t, updatedSecret) secretWatch.Modify(&secret1)
assert.Equal(t, secret1.Name, updatedSecret.Name) updatedSecret = GetSecretFromChan(cluster1UpdateChan)
assert.Equal(t, secret1.Namespace, updatedSecret.Namespace) assert.NotNil(t, updatedSecret)
assert.True(t, secretsEqual(secret1, *updatedSecret), assert.Equal(t, secret1.Name, updatedSecret.Name)
fmt.Sprintf("expected: %v, actual: %v", secret1, *updatedSecret)) assert.Equal(t, secret1.Namespace, updatedSecret.Namespace)
// Wait for the secret to be updated in the informer store. assert.True(t, secretsEqual(secret1, *updatedSecret),
err = WaitForSecretStoreUpdate( fmt.Sprintf("expected: %v, actual: %v", secret1, *updatedSecret))
secretController.secretFederatedInformer.GetTargetStore(), // Wait for the secret to be updated in the informer store.
cluster1.Name, types.NamespacedName{Namespace: secret1.Namespace, Name: secret1.Name}.String(), err = WaitForSecretStoreUpdate(
updatedSecret, wait.ForeverTestTimeout) secretController.secretFederatedInformer.GetTargetStore(),
assert.Nil(t, err, "secret should have been updated in the informer store") cluster1.Name, types.NamespacedName{Namespace: secret1.Namespace, Name: secret1.Name}.String(),
updatedSecret, wait.ForeverTestTimeout)
assert.Nil(t, err, "secret should have been updated in the informer store")
// Test update federated secret. // Test update federated secret.
secret1.Data = map[string][]byte{ secret1.Data = map[string][]byte{
"config": []byte("myconfigurationfile"), "config": []byte("myconfigurationfile"),
} }
secretWatch.Modify(&secret1) secretWatch.Modify(&secret1)
updatedSecret2 := GetSecretFromChan(cluster1UpdateChan) updatedSecret2 := GetSecretFromChan(cluster1UpdateChan)
assert.NotNil(t, updatedSecret2) assert.NotNil(t, updatedSecret2)
assert.Equal(t, secret1.Name, updatedSecret2.Name) assert.Equal(t, secret1.Name, updatedSecret2.Name)
assert.Equal(t, secret1.Namespace, updatedSecret.Namespace) assert.Equal(t, secret1.Namespace, updatedSecret.Namespace)
assert.True(t, secretsEqual(secret1, *updatedSecret2), assert.True(t, secretsEqual(secret1, *updatedSecret2),
fmt.Sprintf("expected: %v, actual: %v", secret1, *updatedSecret2)) fmt.Sprintf("expected: %v, actual: %v", secret1, *updatedSecret2))
*/
// Test add cluster // Test add cluster
clusterWatch.Add(cluster2) clusterWatch.Add(cluster2)