Skip to content

Commit 6b1f3c9

Browse files
committed
addressing comments
1 parent 97723f2 commit 6b1f3c9

File tree

1 file changed

+2
-60
lines changed

1 file changed

+2
-60
lines changed

test/cluster/access_control_test.go

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var aerospikeConfigWithSecurityWithQuota = &asdbv1.AerospikeConfigSpec{
5959
},
6060
}
6161

62-
var _ = Describe(
62+
var _ = FDescribe(
6363
"AccessControl", func() {
6464
ctx := goctx.TODO()
6565

@@ -1576,16 +1576,6 @@ var _ = Describe(
15761576
},
15771577
}
15781578

1579-
aerospikeConfigSpec, err = NewAerospikeConfSpec(latestImage)
1580-
if err != nil {
1581-
Fail(
1582-
fmt.Sprintf(
1583-
"Invalid Aerospike Config Spec: %v",
1584-
err,
1585-
),
1586-
)
1587-
}
1588-
15891579
aerospikeConfigSpec.setSecurity(true)
15901580

15911581
aeroCluster = getAerospikeClusterSpecWithAccessControl(
@@ -1662,16 +1652,6 @@ var _ = Describe(
16621652
Fail("Security should be enabled")
16631653
}
16641654

1665-
aerospikeConfigSpec, err = NewAerospikeConfSpec(latestImage)
1666-
if err != nil {
1667-
Fail(
1668-
fmt.Sprintf(
1669-
"Invalid Aerospike Config Spec: %v",
1670-
err,
1671-
),
1672-
)
1673-
}
1674-
16751655
aerospikeConfigSpec.setSecurity(false)
16761656
accessControl = nil
16771657

@@ -1748,16 +1728,6 @@ var _ = Describe(
17481728
},
17491729
}
17501730

1751-
aerospikeConfigSpec, err = NewAerospikeConfSpec(latestImage)
1752-
if err != nil {
1753-
Fail(
1754-
fmt.Sprintf(
1755-
"Invalid Aerospike Config Spec: %v",
1756-
err,
1757-
),
1758-
)
1759-
}
1760-
17611731
aerospikeConfigSpec.setSecurity(true)
17621732

17631733
aeroCluster = getAerospikeClusterSpecWithAccessControl(
@@ -1783,7 +1753,7 @@ var _ = Describe(
17831753

17841754
Expect(err).To(HaveOccurred())
17851755
Expect(err.Error()).Should(ContainSubstring(
1786-
"status has not yet been updated with the current configuration"))
1756+
"security enablement is in progress"))
17871757

17881758
Eventually(func(g Gomega) {
17891759
err := testAccessControlReconcile(aeroCluster, ctx)
@@ -1967,16 +1937,6 @@ var _ = Describe(
19671937
},
19681938
}
19691939

1970-
aerospikeConfigSpec, err = NewAerospikeConfSpec(latestImage)
1971-
if err != nil {
1972-
Fail(
1973-
fmt.Sprintf(
1974-
"Invalid Aerospike Config Spec: %v",
1975-
err,
1976-
),
1977-
)
1978-
}
1979-
19801940
aerospikeConfigSpec.setSecurity(true)
19811941
aerospikeConfigSpec.setEnableQuotas(true)
19821942

@@ -2040,15 +2000,6 @@ var _ = Describe(
20402000
},
20412001
}
20422002

2043-
aerospikeConfigSpec, err = NewAerospikeConfSpec(latestImage)
2044-
if err != nil {
2045-
Fail(
2046-
fmt.Sprintf(
2047-
"Invalid Aerospike Config Spec: %v",
2048-
err,
2049-
),
2050-
)
2051-
}
20522003
aerospikeConfigSpec.setSecurity(true)
20532004
aerospikeConfigSpec.setEnableQuotas(false)
20542005

@@ -2114,15 +2065,6 @@ var _ = Describe(
21142065
},
21152066
}
21162067

2117-
aerospikeConfigSpec, err = NewAerospikeConfSpec(latestImage)
2118-
if err != nil {
2119-
Fail(
2120-
fmt.Sprintf(
2121-
"Invalid Aerospike Config Spec: %v",
2122-
err,
2123-
),
2124-
)
2125-
}
21262068
aerospikeConfigSpec.setSecurity(true)
21272069
aerospikeConfigSpec.setEnableQuotas(false)
21282070

0 commit comments

Comments
 (0)