Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a2f5c82

Browse files
tatarutytataruty
committed
Adding logging to functional tests
1 parent 8fe3e6d commit a2f5c82

File tree

9 files changed

+1175
-86
lines changed

9 files changed

+1175
-86
lines changed

‎tests/suite/advanced_routing_test.go‎

Lines changed: 130 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,91 @@ var _ = Describe("AdvancedRouting", Ordered, Label("functional", "routing"), fun
3535
Name: namespace,
3636
},
3737
}
38+
GinkgoWriter.Printf("Creating namespace %q\n", ns)
3839

39-
Expect(resourceManager.Apply([]client.Object{ns})).To(Succeed())
40-
Expect(resourceManager.ApplyFromFiles(files, namespace)).To(Succeed())
41-
Expect(resourceManager.WaitForAppsToBeReady(namespace)).To(Succeed())
40+
applyErr := resourceManager.Apply([]client.Object{ns})
41+
if applyErr != nil {
42+
GinkgoWriter.Printf(
43+
"ERROR occurred during applying resource to namespace %q, error: %s\n",
44+
ns,
45+
applyErr,
46+
)
47+
}
48+
Expect(applyErr).ToNot(HaveOccurred())
49+
GinkgoWriter.Printf("Namespace %q applied successfully,\n", ns)
50+
51+
GinkgoWriter.Printf("Applying resources from files %v to namespace %q\n", files, namespace)
52+
applyFromFilesErr := resourceManager.ApplyFromFiles(files, namespace)
53+
if applyFromFilesErr != nil {
54+
GinkgoWriter.Printf(
55+
"ERROR occurred during applying resource from files %v, in namespace %q, error: %s\n",
56+
files,
57+
namespace,
58+
applyFromFilesErr,
59+
)
60+
}
61+
Expect(applyFromFilesErr).ToNot(HaveOccurred())
62+
GinkgoWriter.Printf("Resources from files applied successfully to namespace %q,\n", namespace)
4263

64+
GinkgoWriter.Printf("Waiting for apps to be ready in namespace %q\n", namespace)
65+
waitingErr := resourceManager.WaitForAppsToBeReady(namespace)
66+
if waitingErr != nil {
67+
GinkgoWriter.Printf(
68+
"ERROR occurred during waiting for apps to be ready in namespace %q, error: %s\n",
69+
namespace,
70+
waitingErr,
71+
)
72+
}
73+
Expect(waitingErr).ToNot(HaveOccurred())
74+
GinkgoWriter.Printf("Apps are ready in namespace %q,\n", namespace)
75+
76+
GinkgoWriter.Printf("Retrieving ready NGINX pods in namespace %q\n", namespace)
4377
nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, namespace, timeoutConfig.GetStatusTimeout)
78+
if err != nil {
79+
GinkgoWriter.Printf(
80+
"ERROR occurred during waiting for NginxPods to be ready with namespace %q, error: %v\n",
81+
namespace,
82+
err,
83+
)
84+
}
4485
Expect(err).ToNot(HaveOccurred())
86+
GinkgoWriter.Printf("Nginx pods in namespace %q: %v\n", namespace, nginxPodNames)
4587
Expect(nginxPodNames).To(HaveLen(1))
4688

89+
GinkgoWriter.Printf(
90+
"Setting up port-forward to nginx pod %s in namespace %q\n",
91+
nginxPodNames[0],
92+
namespace,
93+
)
4794
setUpPortForward(nginxPodNames[0], namespace)
4895
})
4996

5097
AfterAll(func() {
98+
GinkgoWriter.Printf("Cleaning up resources in namespace %q\n", namespace)
5199
framework.AddNginxLogsAndEventsToReport(resourceManager, namespace)
100+
GinkgoWriter.Printf("Cleaning up portForward")
52101
cleanUpPortForward()
53102

54-
Expect(resourceManager.DeleteFromFiles(files, namespace)).To(Succeed())
55-
Expect(resourceManager.DeleteNamespace(namespace)).To(Succeed())
103+
GinkgoWriter.Printf("Deleting resources from files: \n%v \nin namespace %q\n", files, namespace)
104+
deleteFromFilesErr := resourceManager.DeleteFromFiles(files, namespace)
105+
if deleteFromFilesErr != nil {
106+
GinkgoWriter.Printf(
107+
"ERROR occurred during deleting from files \n%v \nin namespace %q, error: %s\n",
108+
files,
109+
namespace,
110+
deleteFromFilesErr,
111+
)
112+
}
113+
Expect(deleteFromFilesErr).ToNot(HaveOccurred())
114+
GinkgoWriter.Printf("Resources from files: %v deleted successfully from namespace %q,\n", files, namespace)
115+
116+
GinkgoWriter.Printf("Deleting namespace %q\n", namespace)
117+
deleteNSErr := resourceManager.DeleteNamespace(namespace)
118+
if deleteNSErr != nil {
119+
GinkgoWriter.Printf("ERROR occurred during deleting namespace %q, error: %s\n", namespace, deleteNSErr)
120+
}
121+
Expect(deleteNSErr).ToNot(HaveOccurred())
122+
GinkgoWriter.Printf("Namespace %q deleted successfully,\n", namespace)
56123
})
57124

58125
When("valid advanced routing settings are configured for Routes", func() {
@@ -63,6 +130,7 @@ var _ = Describe("AdvancedRouting", Ordered, Label("functional", "routing"), fun
63130
port = portFwdPort
64131
}
65132

133+
GinkgoWriter.Printf("Setting up base URL for tests: http://cafe.example.com:%d\n", port)
66134
baseURL = fmt.Sprintf("http://cafe.example.com:%d", port)
67135
})
68136

@@ -71,7 +139,21 @@ var _ = Describe("AdvancedRouting", Ordered, Label("functional", "routing"), fun
71139
url := baseURL + uri
72140
Eventually(
73141
func() error {
74-
return expectRequestToRespondFromExpectedServer(url, address, serverName, headers, queryParams)
142+
requestDetails := fmt.Sprintf(
143+
"URL: %s, Address: %s, serverName: %s, Headers: %v, QueryParams: %v\n",
144+
url,
145+
address,
146+
serverName,
147+
headers,
148+
queryParams,
149+
)
150+
GinkgoWriter.Printf("\nSending request %v\n", requestDetails)
151+
err := expectRequestToRespondFromExpectedServer(url, address, serverName, headers, queryParams)
152+
if err != nil {
153+
GinkgoWriter.Printf("ERROR occurred during getting response %verror: %s\n", requestDetails, err)
154+
}
155+
156+
return err
75157
}).
76158
WithTimeout(timeoutConfig.GetTimeout).
77159
WithPolling(500 * time.Millisecond).
@@ -116,22 +198,61 @@ func expectRequestToRespondFromExpectedServer(
116198
appURL, address, expServerName string,
117199
headers, queryParams map[string]string,
118200
) error {
201+
requestDetails := fmt.Sprintf(
202+
"URL: %s, Address: %s, ServerName: %s, Headers: %v, QueryParams: %v\n",
203+
appURL,
204+
address,
205+
expServerName,
206+
headers,
207+
queryParams,
208+
)
119209
status, body, err := framework.Get(appURL, address, timeoutConfig.RequestTimeout, headers, queryParams)
210+
GinkgoWriter.Printf(
211+
"For the request %vReceived response: status: %d, body: %s\n",
212+
requestDetails,
213+
status,
214+
body,
215+
)
120216
if err != nil {
217+
GinkgoWriter.Printf("\nEROOR occurred during getting response: %v\n", err)
218+
121219
return err
122220
}
123221

124222
if status != http.StatusOK {
125-
return errors.New("http status was not 200")
223+
statusErr := errors.New("http status was not 200")
224+
GinkgoWriter.Printf(
225+
"ERROR: Returned status is not OK for request %v it is: %v, returning error: %s\n",
226+
requestDetails,
227+
status,
228+
statusErr,
229+
)
230+
231+
return statusErr
126232
}
127233

128234
actualServerName, err := extractServerName(body)
129235
if err != nil {
236+
GinkgoWriter.Printf(
237+
"ERROR occurred during extracting server name from body: %v \nfor request: %verror: %v\n",
238+
body,
239+
requestDetails,
240+
err,
241+
)
242+
130243
return err
131244
}
132245

133246
if !strings.Contains(actualServerName, expServerName) {
134-
return errors.New("expected response body to contain correct server name")
247+
snErr := errors.New("expected response body to contain correct server name")
248+
GinkgoWriter.Printf(
249+
"Server name %s is not the same as expected %s, error: %s\n",
250+
actualServerName,
251+
expServerName,
252+
snErr,
253+
)
254+
255+
return snErr
135256
}
136257

137258
return nil
@@ -143,5 +264,6 @@ func extractServerName(responseBody string) (string, error) {
143264
if len(matches) < 2 {
144265
return "", errors.New("server name not found")
145266
}
267+
146268
return matches[1], nil
147269
}

0 commit comments

Comments
 (0)