Skip to content

Commit

Permalink
Implement PR-1 golangci review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
faizanahmad055 committed Jul 12, 2018
1 parent f73318f commit c35bb74
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions internal/pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,24 @@ func TestControllerForUpdatingConfigmapShouldUpdateDeployment(t *testing.T) {
logrus.Infof("Updating Configmap %q.\n", configmap.GetObjectMeta().GetName())
configmap, err = configmapClient.Get(configmapName, metav1.GetOptions{})
if err != nil {

logrus.Infof("Error while getting configmap %v", err)
}
configmap = updateConfigmap(namespace, configmapName)
_, updateErr := configmapClient.Update(configmap)

// TODO: Add functionality to verify reloader functionality here

if updateErr != nil {
controller.client.CoreV1().ConfigMaps(namespace).Delete(configmapName, &metav1.DeleteOptions{})
error := controller.client.CoreV1().ConfigMaps(namespace).Delete(configmapName, &metav1.DeleteOptions{})
logrus.Infof("Error while deleting the configmap %v", error)
panic(updateErr)
}
time.Sleep(10 * time.Second)
logrus.Infof("Deleting Configmap %q.\n", configmap.GetObjectMeta().GetName())
controller.client.CoreV1().ConfigMaps(namespace).Delete(configmapName, &metav1.DeleteOptions{})
error := controller.client.CoreV1().ConfigMaps(namespace).Delete(configmapName, &metav1.DeleteOptions{})
if error != nil {
logrus.Infof("Error while deleting the configmap %v", error)
}
time.Sleep(15 * time.Second)
}

Expand Down Expand Up @@ -101,20 +105,24 @@ func TestControllerForUpdatingSecretShouldUpdateDeployment(t *testing.T) {
logrus.Infof("Updating Secret %q.\n", secret.GetObjectMeta().GetName())
secret, err = secretClient.Get(secretName, metav1.GetOptions{})
if err != nil {

logrus.Infof("Error while getting secret %v", err)
}
secret = updateSecret(namespace, secretName)
_, updateErr := secretClient.Update(secret)

// TODO: Add functionality to verify reloader functionality here

if updateErr != nil {
controller.client.CoreV1().Secrets(namespace).Delete(secretName, &metav1.DeleteOptions{})
error := controller.client.CoreV1().Secrets(namespace).Delete(secretName, &metav1.DeleteOptions{})
logrus.Infof("Error while deleting the secret %v", error)
panic(updateErr)
}
time.Sleep(10 * time.Second)
logrus.Infof("Deleting Secret %q.\n", secret.GetObjectMeta().GetName())
controller.client.CoreV1().Secrets(namespace).Delete(secretName, &metav1.DeleteOptions{})
error := controller.client.CoreV1().Secrets(namespace).Delete(secretName, &metav1.DeleteOptions{})
if error != nil {
logrus.Infof("Error while deleting the secret %v", error)
}
time.Sleep(15 * time.Second)
}

Expand Down

0 comments on commit c35bb74

Please sign in to comment.