Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor end-to-end tests #525

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Refactor end-to-end tests #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
863b07d
Extract environment-specific properties.
nikos912000 Mar 17, 2022
cf52837
Fix constant naming.
nikos912000 Mar 17, 2022
e6898ac
Replace sleep with call to WaitForCacheSync.
nikos912000 Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions controllers/disruption_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ func listChaosPods(instance *chaosv1beta1.Disruption) (corev1.PodList, error) {
ls := labels.NewSelector()

// create requirements
targetPodRequirement, _ := labels.NewRequirement(chaostypes.TargetLabel, selection.In, []string{"foo", "bar", "minikube"})
disruptionNameRequirement, _ := labels.NewRequirement(chaostypes.DisruptionNameLabel, selection.Equals, []string{instance.Name})
disruptionNamespaceRequirement, _ := labels.NewRequirement(chaostypes.DisruptionNamespaceLabel, selection.Equals, []string{instance.Namespace})

// add requirements to label selector
ls = ls.Add(*targetPodRequirement, *disruptionNamespaceRequirement, *disruptionNameRequirement)
ls = ls.Add(*disruptionNamespaceRequirement, *disruptionNameRequirement)

// get matching pods
if err := k8sClient.List(context.Background(), &l, &client.ListOptions{
Expand Down Expand Up @@ -134,7 +133,7 @@ var _ = Describe("Disruption Controller", func() {
disruption = &chaosv1beta1.Disruption{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Namespace: "default",
Namespace: namespace,
},
Spec: chaosv1beta1.DisruptionSpec{
DryRun: true,
Expand Down Expand Up @@ -224,7 +223,7 @@ var _ = Describe("Disruption Controller", func() {
disruption = &chaosv1beta1.Disruption{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Namespace: "default",
Namespace: namespace,
},
Spec: chaosv1beta1.DisruptionSpec{
DryRun: false,
Expand Down
31 changes: 24 additions & 7 deletions controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ import (
// http://onsi.github.io/ginkgo/ to learn more about Ginkgo.

const (
timeout = time.Second * 45
timeout = time.Second * 45
hostTopologyKey = "kubernetes.io/hostname"
)

var (
Expand All @@ -56,6 +57,9 @@ var (
instanceKey types.NamespacedName
targetPodA *corev1.Pod
targetPodB *corev1.Pod
namespace string
nodeLabel map[string]string
testPodImage string
)

func TestAPIs(t *testing.T) {
Expand Down Expand Up @@ -99,19 +103,25 @@ var _ = BeforeSuite(func(done Done) {
Expect(err).ToNot(HaveOccurred())
}()

instanceKey = types.NamespacedName{Name: "foo", Namespace: "default"}
// wait for the cache to sync
Expect(k8sManager.GetCache().WaitForCacheSync(context.Background())).To(BeTrue())

// set up enviroment-specific properties
setupEnvironment()

instanceKey = types.NamespacedName{Name: "foo", Namespace: namespace}
targetPodA = &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Namespace: "default",
Namespace: namespace,
Labels: map[string]string{
"foo": "bar",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Image: "k8s.gcr.io/pause:3.4.1",
Image: testPodImage,
Name: "ctn1",
VolumeMounts: []corev1.VolumeMount{
{
Expand All @@ -121,7 +131,7 @@ var _ = BeforeSuite(func(done Done) {
},
},
{
Image: "k8s.gcr.io/pause:3.4.1",
Image: testPodImage,
Name: "ctn2",
VolumeMounts: []corev1.VolumeMount{
{
Expand Down Expand Up @@ -150,15 +160,15 @@ var _ = BeforeSuite(func(done Done) {
targetPodB = &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "bar",
Namespace: "default",
Namespace: namespace,
Labels: map[string]string{
"foo": "bar",
},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Image: "k8s.gcr.io/pause:3.4.1",
Image: testPodImage,
Name: "ctn1",
VolumeMounts: []corev1.VolumeMount{
{
Expand Down Expand Up @@ -209,6 +219,13 @@ var _ = AfterSuite(func() {
Expect(testEnv.Stop()).To(BeNil())
})

// setupEnvironment sets up environment-specific properties
func setupEnvironment() {
namespace = "chaos-engineering"
testPodImage = "k8s.gcr.io/pause:3.4.1"
nodeLabel = map[string]string{hostTopologyKey: "minikube"}
}

// podsAreRunning returns true when all the given pods have all their containers running
func podsAreRunning(pods ...*corev1.Pod) (bool, error) {
for _, pod := range pods {
Expand Down