mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-18 11:00:25 +00:00
e2e: reformat long lines in this package to 120 chars
We have many declarations and invocations..etc with long lines which are very difficult to follow while doing code reading. This address the issues in 'e2e/upgrade_*.go' files to restrict the line length to 120 chars. Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
parent
41ecaadc82
commit
c2cda4909b
@ -112,11 +112,15 @@ var _ = Describe("CephFS Upgrade Testing", func() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to delete configmap with error %v", err)
|
e2elog.Failf("failed to delete configmap with error %v", err)
|
||||||
}
|
}
|
||||||
err = c.CoreV1().Secrets(cephCSINamespace).Delete(context.TODO(), cephFSProvisionerSecretName, metav1.DeleteOptions{})
|
err = c.CoreV1().
|
||||||
|
Secrets(cephCSINamespace).
|
||||||
|
Delete(context.TODO(), cephFSProvisionerSecretName, metav1.DeleteOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to delete provisioner secret with error %v", err)
|
e2elog.Failf("failed to delete provisioner secret with error %v", err)
|
||||||
}
|
}
|
||||||
err = c.CoreV1().Secrets(cephCSINamespace).Delete(context.TODO(), cephFSNodePluginSecretName, metav1.DeleteOptions{})
|
err = c.CoreV1().
|
||||||
|
Secrets(cephCSINamespace).
|
||||||
|
Delete(context.TODO(), cephFSNodePluginSecretName, metav1.DeleteOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to delete node secret with error %v", err)
|
e2elog.Failf("failed to delete node secret with error %v", err)
|
||||||
}
|
}
|
||||||
@ -191,7 +195,11 @@ var _ = Describe("CephFS Upgrade Testing", func() {
|
|||||||
filePath := filepath.Join(mountPath, "testClone")
|
filePath := filepath.Join(mountPath, "testClone")
|
||||||
|
|
||||||
// create a test file at the mountPath.
|
// create a test file at the mountPath.
|
||||||
_, stdErr := execCommandInPodAndAllowFail(f, fmt.Sprintf("echo %s > %s", data, filePath), app.Namespace, &opt)
|
_, stdErr := execCommandInPodAndAllowFail(
|
||||||
|
f,
|
||||||
|
fmt.Sprintf("echo %s > %s", data, filePath),
|
||||||
|
app.Namespace,
|
||||||
|
&opt)
|
||||||
if stdErr != "" {
|
if stdErr != "" {
|
||||||
e2elog.Failf("failed to write data to a file %s", stdErr)
|
e2elog.Failf("failed to write data to a file %s", stdErr)
|
||||||
}
|
}
|
||||||
@ -289,7 +297,10 @@ var _ = Describe("CephFS Upgrade Testing", func() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if strings.Compare(newCheckSum, checkSum) != 0 {
|
if strings.Compare(newCheckSum, checkSum) != 0 {
|
||||||
e2elog.Failf("The checksum of files did not match, expected %s received %s ", checkSum, newCheckSum)
|
e2elog.Failf(
|
||||||
|
"The checksum of files did not match, expected %s received %s ",
|
||||||
|
checkSum,
|
||||||
|
newCheckSum)
|
||||||
}
|
}
|
||||||
e2elog.Logf("The checksum of files matched")
|
e2elog.Logf("The checksum of files matched")
|
||||||
|
|
||||||
@ -350,7 +361,10 @@ var _ = Describe("CephFS Upgrade Testing", func() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if strings.Compare(newCheckSum, checkSum) != 0 {
|
if strings.Compare(newCheckSum, checkSum) != 0 {
|
||||||
e2elog.Failf("The checksum of files did not match, expected %s received %s", checkSum, newCheckSum)
|
e2elog.Failf(
|
||||||
|
"The checksum of files did not match, expected %s received %s",
|
||||||
|
checkSum,
|
||||||
|
newCheckSum)
|
||||||
}
|
}
|
||||||
e2elog.Logf("The checksum of files matched")
|
e2elog.Logf("The checksum of files matched")
|
||||||
|
|
||||||
@ -373,7 +387,9 @@ var _ = Describe("CephFS Upgrade Testing", func() {
|
|||||||
opt := metav1.ListOptions{
|
opt := metav1.ListOptions{
|
||||||
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
|
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
|
||||||
}
|
}
|
||||||
pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(context.TODO(), pvc.Name, metav1.GetOptions{})
|
pvc, err = f.ClientSet.CoreV1().
|
||||||
|
PersistentVolumeClaims(pvc.Namespace).
|
||||||
|
Get(context.TODO(), pvc.Name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to get pvc with error %v", err)
|
e2elog.Failf("failed to get pvc with error %v", err)
|
||||||
}
|
}
|
||||||
|
@ -119,11 +119,15 @@ var _ = Describe("RBD Upgrade Testing", func() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to delete configmap with error %v", err)
|
e2elog.Failf("failed to delete configmap with error %v", err)
|
||||||
}
|
}
|
||||||
err = c.CoreV1().Secrets(cephCSINamespace).Delete(context.TODO(), rbdProvisionerSecretName, metav1.DeleteOptions{})
|
err = c.CoreV1().
|
||||||
|
Secrets(cephCSINamespace).
|
||||||
|
Delete(context.TODO(), rbdProvisionerSecretName, metav1.DeleteOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to delete provisioner secret with error %v", err)
|
e2elog.Failf("failed to delete provisioner secret with error %v", err)
|
||||||
}
|
}
|
||||||
err = c.CoreV1().Secrets(cephCSINamespace).Delete(context.TODO(), rbdNodePluginSecretName, metav1.DeleteOptions{})
|
err = c.CoreV1().
|
||||||
|
Secrets(cephCSINamespace).
|
||||||
|
Delete(context.TODO(), rbdNodePluginSecretName, metav1.DeleteOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to delete node secret with error %v", err)
|
e2elog.Failf("failed to delete node secret with error %v", err)
|
||||||
}
|
}
|
||||||
@ -206,7 +210,11 @@ var _ = Describe("RBD Upgrade Testing", func() {
|
|||||||
filePath := filepath.Join(mountPath, "testClone")
|
filePath := filepath.Join(mountPath, "testClone")
|
||||||
|
|
||||||
// create a test file at the mountPath.
|
// create a test file at the mountPath.
|
||||||
_, stdErr := execCommandInPodAndAllowFail(f, fmt.Sprintf("echo %s > %s", data, filePath), app.Namespace, &opt)
|
_, stdErr := execCommandInPodAndAllowFail(
|
||||||
|
f,
|
||||||
|
fmt.Sprintf("echo %s > %s", data, filePath),
|
||||||
|
app.Namespace,
|
||||||
|
&opt)
|
||||||
if stdErr != "" {
|
if stdErr != "" {
|
||||||
e2elog.Failf("failed to write data to a file %s", stdErr)
|
e2elog.Failf("failed to write data to a file %s", stdErr)
|
||||||
}
|
}
|
||||||
@ -307,7 +315,10 @@ var _ = Describe("RBD Upgrade Testing", func() {
|
|||||||
e2elog.Failf("failed to calculate checksum with error %v", err)
|
e2elog.Failf("failed to calculate checksum with error %v", err)
|
||||||
}
|
}
|
||||||
if strings.Compare(newCheckSum, checkSum) != 0 {
|
if strings.Compare(newCheckSum, checkSum) != 0 {
|
||||||
e2elog.Failf("The checksum of files did not match, expected %s received %s ", checkSum, newCheckSum)
|
e2elog.Failf(
|
||||||
|
"The checksum of files did not match, expected %s received %s",
|
||||||
|
checkSum,
|
||||||
|
newCheckSum)
|
||||||
}
|
}
|
||||||
e2elog.Logf("The checksum of files matched")
|
e2elog.Logf("The checksum of files matched")
|
||||||
|
|
||||||
@ -356,7 +367,10 @@ var _ = Describe("RBD Upgrade Testing", func() {
|
|||||||
e2elog.Failf("failed to calculate checksum with error %v", err)
|
e2elog.Failf("failed to calculate checksum with error %v", err)
|
||||||
}
|
}
|
||||||
if strings.Compare(newCheckSum, checkSum) != 0 {
|
if strings.Compare(newCheckSum, checkSum) != 0 {
|
||||||
e2elog.Failf("The checksum of files did not match, expected %s received %s ", checkSum, newCheckSum)
|
e2elog.Failf(
|
||||||
|
"The checksum of files did not match, expected %s received %s",
|
||||||
|
checkSum,
|
||||||
|
newCheckSum)
|
||||||
}
|
}
|
||||||
e2elog.Logf("The checksum of files matched")
|
e2elog.Logf("The checksum of files matched")
|
||||||
|
|
||||||
@ -380,7 +394,9 @@ var _ = Describe("RBD Upgrade Testing", func() {
|
|||||||
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
|
LabelSelector: fmt.Sprintf("%s=%s", appKey, label[appKey]),
|
||||||
}
|
}
|
||||||
var err error
|
var err error
|
||||||
pvc, err = f.ClientSet.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(context.TODO(), pvc.Name, metav1.GetOptions{})
|
pvc, err = f.ClientSet.CoreV1().
|
||||||
|
PersistentVolumeClaims(pvc.Namespace).
|
||||||
|
Get(context.TODO(), pvc.Name, metav1.GetOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to get pvc with error %v", err)
|
e2elog.Failf("failed to get pvc with error %v", err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user