Skip to content
This repository was archived by the owner on Oct 3, 2019. It is now read-only.

Commit 74a2b05

Browse files
committed
Add gitsourceananlysis tests
1 parent cabdab0 commit 74a2b05

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

test/e2e/e2eutils.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,17 @@ func WaitUntilGitSourceReconcile(t *test.Framework, nsd types.NamespacedName) er
2424
})
2525
return err
2626
}
27+
28+
// WaitUntilGitSourceAnalyzeReconcile waits execution until controller finishes reconciling.
29+
func WaitUntilGitSourceAnalyzeReconcile(t *test.Framework, nsd types.NamespacedName) error {
30+
var err error
31+
err = wait.Poll(time.Second*5, time.Minute*1, func() (bool, error) {
32+
var gitSourceAnalysis devconsoleapi.GitSourceAnalysis
33+
err = t.Client.Get(goctx.TODO(), nsd, &gitSourceAnalysis)
34+
if err != nil {
35+
return false, err
36+
}
37+
return gitSourceAnalysis.Status.Analyzed, nil
38+
})
39+
return err
40+
}

test/e2e/gitsource_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,4 @@ func TestGitsource(t *testing.T) {
114114
require.Equal(t, devconsoleapi.Failed, outputGS.Status.Connection.State)
115115
require.Equal(t, namespace, outputGS.ObjectMeta.Namespace)
116116
})
117-
118117
}

test/e2e/gitsourceanalysis_test.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,31 @@ func TestGitsourceAnalysis(t *testing.T) {
106106

107107
err = WaitUntilGitSourceReconcile(f, types.NamespacedName{Name: "my-git-source", Namespace: namespace})
108108
if err != nil {
109-
t.Log("Failed to wait for gitsource reconciel")
109+
t.Log("Failed to wait for gitsource reconcile")
110+
t.Fail()
111+
}
112+
113+
err = WaitUntilGitSourceAnalyzeReconcile(f, types.NamespacedName{Name: "gitsource-analysis", Namespace: namespace})
114+
if err != nil {
115+
t.Log("Failed to wait for gitsource analyze reconcile")
116+
t.Fail()
110117
}
111118

112119
t.Run("retrieve component and verify related resources are created", func(t *testing.T) {
113120
outputCR := &devconsoleapi.GitSource{}
114121
err = f.Client.Get(context.TODO(), types.NamespacedName{Name: "my-git-source", Namespace: namespace}, outputCR)
115-
t.Logf("gitsource %+v", outputCR)
116122
require.NoError(t, err, "failed to retrieve custom resource of kind `GitSource`")
117123
require.Equal(t, "my-git-source", outputCR.ObjectMeta.Name)
118124
require.Equal(t, namespace, outputCR.ObjectMeta.Namespace)
119125
})
120126

121-
t.Run("check if gitsourceanalysis has referrence to gitsource", func(t *testing.T) {
127+
t.Run("check if gitsourceanalysis has referrence to gitsource and if build env stats are correct", func(t *testing.T) {
122128
outputGsa := &devconsoleapi.GitSourceAnalysis{}
123129
err = f.Client.Get(context.TODO(), types.NamespacedName{Name: "gitsource-analysis", Namespace: namespace}, outputGsa)
124130
require.NoError(t, err, "failed to retrieve custom resource of kind `GitSourceAnalysis`")
131+
require.Equal(t, "my-git-source", outputGsa.Spec.GitSourceRef.Name)
132+
require.Equal(t, true, outputGsa.Status.Analyzed)
133+
require.NotZero(t, len(outputGsa.Status.BuildEnvStatistics.DetectedBuildTypes), "build type has not been detected")
134+
require.Equal(t, "go", outputGsa.Status.BuildEnvStatistics.DetectedBuildTypes[0].Language)
125135
})
126136
}

0 commit comments

Comments
 (0)