@@ -47,7 +47,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) {
4747 g .Eventually (IntegrationPodPhase (t , ctx , ns , name ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
4848 g .Eventually (IntegrationConditionStatus (t , ctx , ns , name , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
4949 g .Eventually (IntegrationLogs (t , ctx , ns , name ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
50- integrationKitName := IntegrationKit (t , ctx , ns , name )()
50+ integrationKitName := IntegrationKitName (t , ctx , ns , name )()
5151 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .BaseImage ).Should (Equal (defaults .BaseImage ()))
5252 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .RootImage ).Should (Equal (defaults .BaseImage ()))
5353
@@ -57,7 +57,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) {
5757 g .Eventually (IntegrationPodPhase (t , ctx , ns , nameClone ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
5858 g .Eventually (IntegrationConditionStatus (t , ctx , ns , nameClone , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
5959 g .Eventually (IntegrationLogs (t , ctx , ns , nameClone ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
60- integrationCloneKitName := IntegrationKit (t , ctx , ns , nameClone )()
60+ integrationCloneKitName := IntegrationKitName (t , ctx , ns , nameClone )()
6161 g .Eventually (integrationCloneKitName ).Should (Equal (integrationKitName ))
6262 })
6363
@@ -69,7 +69,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) {
6969 g .Eventually (IntegrationPodPhase (t , ctx , ns , nameIncremental ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
7070 g .Eventually (IntegrationConditionStatus (t , ctx , ns , nameIncremental , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
7171 g .Eventually (IntegrationLogs (t , ctx , ns , nameIncremental ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
72- integrationIncrementalKitName := IntegrationKit (t , ctx , ns , nameIncremental )()
72+ integrationIncrementalKitName := IntegrationKitName (t , ctx , ns , nameIncremental )()
7373 // the container comes in a format like
7474 // 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
7575 // we should be saving just to check the substring is contained
@@ -90,7 +90,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
9090 g .Eventually (IntegrationPodPhase (t , ctx , ns , name ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
9191 g .Eventually (IntegrationConditionStatus (t , ctx , ns , name , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
9292 g .Eventually (IntegrationLogs (t , ctx , ns , name ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
93- integrationKitName := IntegrationKit (t , ctx , ns , name )()
93+ integrationKitName := IntegrationKitName (t , ctx , ns , name )()
9494 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .BaseImage ).Should (Equal (defaults .BaseImage ()))
9595 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .RootImage ).Should (Equal (defaults .BaseImage ()))
9696 g .Eventually (BuilderPodsCount (t , ctx , ns )).Should (Equal (1 ))
@@ -101,7 +101,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
101101 g .Eventually (IntegrationPodPhase (t , ctx , ns , nameClone ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
102102 g .Eventually (IntegrationConditionStatus (t , ctx , ns , nameClone , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
103103 g .Eventually (IntegrationLogs (t , ctx , ns , nameClone ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
104- integrationCloneKitName := IntegrationKit (t , ctx , ns , nameClone )()
104+ integrationCloneKitName := IntegrationKitName (t , ctx , ns , nameClone )()
105105 g .Eventually (integrationCloneKitName ).Should (Equal (integrationKitName ))
106106 g .Eventually (BuilderPodsCount (t , ctx , ns )).Should (Equal (1 ))
107107 })
@@ -114,7 +114,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
114114 g .Eventually (IntegrationPodPhase (t , ctx , ns , nameIncremental ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
115115 g .Eventually (IntegrationConditionStatus (t , ctx , ns , nameIncremental , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
116116 g .Eventually (IntegrationLogs (t , ctx , ns , nameIncremental ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
117- integrationIncrementalKitName := IntegrationKit (t , ctx , ns , nameIncremental )()
117+ integrationIncrementalKitName := IntegrationKitName (t , ctx , ns , nameIncremental )()
118118 // the container comes in a format like
119119 // 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
120120 // we should be saving just to check the substring is contained
@@ -136,7 +136,7 @@ func TestRunIncrementalBuildOff(t *testing.T) {
136136 g .Eventually (IntegrationPodPhase (t , ctx , ns , name ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
137137 g .Eventually (IntegrationConditionStatus (t , ctx , ns , name , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
138138 g .Eventually (IntegrationLogs (t , ctx , ns , name ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
139- integrationKitName := IntegrationKit (t , ctx , ns , name )()
139+ integrationKitName := IntegrationKitName (t , ctx , ns , name )()
140140 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .BaseImage ).Should (Equal (defaults .BaseImage ()))
141141
142142 t .Run ("Don't reuse previous kit" , func (t * testing.T ) {
@@ -145,7 +145,7 @@ func TestRunIncrementalBuildOff(t *testing.T) {
145145 g .Eventually (IntegrationPodPhase (t , ctx , ns , nameClone ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
146146 g .Eventually (IntegrationConditionStatus (t , ctx , ns , nameClone , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
147147 g .Eventually (IntegrationLogs (t , ctx , ns , nameClone ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
148- integrationCloneKitName := IntegrationKit (t , ctx , ns , nameClone )()
148+ integrationCloneKitName := IntegrationKitName (t , ctx , ns , nameClone )()
149149 g .Eventually (Kit (t , ctx , ns , integrationCloneKitName )().Status .BaseImage ).Should (Equal (defaults .BaseImage ()))
150150 })
151151
@@ -157,7 +157,7 @@ func TestRunIncrementalBuildOff(t *testing.T) {
157157 g .Eventually (IntegrationPodPhase (t , ctx , ns , nameIncremental ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
158158 g .Eventually (IntegrationConditionStatus (t , ctx , ns , nameIncremental , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
159159 g .Eventually (IntegrationLogs (t , ctx , ns , nameIncremental ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
160- integrationIncrementalKitName := IntegrationKit (t , ctx , ns , nameIncremental )()
160+ integrationIncrementalKitName := IntegrationKitName (t , ctx , ns , nameIncremental )()
161161 g .Eventually (Kit (t , ctx , ns , integrationIncrementalKitName )().Status .BaseImage ).Should (Equal (defaults .BaseImage ()))
162162 })
163163 })
@@ -174,7 +174,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
174174 g .Eventually (IntegrationPodPhase (t , ctx , ns , name ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
175175 g .Eventually (IntegrationConditionStatus (t , ctx , ns , name , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
176176 g .Eventually (IntegrationLogs (t , ctx , ns , name ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
177- integrationKitName := IntegrationKit (t , ctx , ns , name )()
177+ integrationKitName := IntegrationKitName (t , ctx , ns , name )()
178178 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .BaseImage ).Should (Equal (defaults .BaseImage ()))
179179 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .RootImage ).Should (Equal (defaults .BaseImage ()))
180180
@@ -186,7 +186,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
186186 g .Eventually (IntegrationPodPhase (t , ctx , ns , nameIncremental ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
187187 g .Eventually (IntegrationConditionStatus (t , ctx , ns , nameIncremental , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
188188 g .Eventually (IntegrationLogs (t , ctx , ns , nameIncremental ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
189- integrationIncrementalKitName := IntegrationKit (t , ctx , ns , nameIncremental )()
189+ integrationIncrementalKitName := IntegrationKitName (t , ctx , ns , nameIncremental )()
190190 // the container comes in a format like
191191 // 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
192192 // we should be save just to check the substring is contained
@@ -202,7 +202,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
202202 g .Eventually (IntegrationPodPhase (t , ctx , ns , name ), TestTimeoutLong ).Should (Equal (corev1 .PodRunning ))
203203 g .Eventually (IntegrationConditionStatus (t , ctx , ns , name , v1 .IntegrationConditionReady ), TestTimeoutShort ).Should (Equal (corev1 .ConditionTrue ))
204204 g .Eventually (IntegrationLogs (t , ctx , ns , name ), TestTimeoutShort ).Should (ContainSubstring ("Magicstring!" ))
205- integrationKitName = IntegrationKit (t , ctx , ns , name )()
205+ integrationKitName = IntegrationKitName (t , ctx , ns , name )()
206206 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .BaseImage ).Should (Equal (newBaseImage ))
207207 g .Eventually (Kit (t , ctx , ns , integrationKitName )().Status .RootImage ).Should (Equal (newBaseImage ))
208208 })
0 commit comments