This is an automated email from the ASF dual-hosted git repository.
ericholguin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 0410344d82 TP fix the integration test failures. (#7792)
0410344d82 is described below
commit 0410344d82b15ab70627dfb0990d54a9dde91a21
Author: Steve Hamrick <[email protected]>
AuthorDate: Fri Sep 8 16:07:20 2023 -0600
TP fix the integration test failures. (#7792)
* Fix TP integration tests
* Readd tests
---------
Co-authored-by: Steve Hamrick <[email protected]>
---
.github/actions/tp-integration-tests/entrypoint.sh | 2 +-
traffic_portal/test/integration/Data/deliveryservices.ts | 5 ++---
traffic_portal/test/integration/Data/topologies.ts | 8 ++++----
.../test/integration/PageObjects/DeliveryServicePage.po.ts | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.github/actions/tp-integration-tests/entrypoint.sh
b/.github/actions/tp-integration-tests/entrypoint.sh
index d2f908f45a..7c3067f42f 100755
--- a/.github/actions/tp-integration-tests/entrypoint.sh
+++ b/.github/actions/tp-integration-tests/entrypoint.sh
@@ -27,7 +27,7 @@ onFail() {
if [[ -f "${REPO_DIR}/traffic_ops/traffic_ops_golang/out.log" ]]; then
mv "${REPO_DIR}/traffic_ops/traffic_ops_golang/out.log" Reports/to.log
fi
- docker logs $CHROME_CONTAINER > Reports/chromium.log 2>&1;
+ docker logs $CHROME_CONTAINER > Reports/chrome.log 2>&1;
docker logs $HUB_CONTAINER > Reports/hub.log 2>&1;
echo "Detailed logs produced info Reports artifact"
exit 1
diff --git a/traffic_portal/test/integration/Data/deliveryservices.ts
b/traffic_portal/test/integration/Data/deliveryservices.ts
index fc2dabe187..a0e8607549 100644
--- a/traffic_portal/test/integration/Data/deliveryservices.ts
+++ b/traffic_portal/test/integration/Data/deliveryservices.ts
@@ -121,8 +121,7 @@ export const deliveryservices = {
name: "location",
value: "/a/b/c/d",
configFile: "remap.config",
- secure: false,
- noRandomize: true
+ secure: false
}
]
},
@@ -159,7 +158,7 @@ export const deliveryservices = {
qstringIgnore: 0,
rangeRequestHandling: 0,
regionalGeoBlocking: false,
- requiredCapabilities: ["DSTestCap"],
+ requiredCapabilities: [],
tenantId: 0,
typeId: 1,
xmlId: "dstestro1",
diff --git a/traffic_portal/test/integration/Data/topologies.ts
b/traffic_portal/test/integration/Data/topologies.ts
index c8c9e346de..5c2bce17b5 100644
--- a/traffic_portal/test/integration/Data/topologies.ts
+++ b/traffic_portal/test/integration/Data/topologies.ts
@@ -315,7 +315,7 @@ export const topologies = {
data: [
{
cacheGroupID: 0,
- cdnID: 2,
+ cdnID: 0,
domainName: "test.net",
hostName: "topologieserver1",
httpsPort: 443,
@@ -350,7 +350,7 @@ export const topologies = {
mgmtIpGateway: "",
mgmtIpNetmask: "",
offlineReason: "",
- physLocationID: 2,
+ physicalLocationID: 2,
profiles: ["TopTestPf"],
routerHostName: "",
routerPortName: "",
@@ -381,7 +381,7 @@ export const topologies = {
},
{
cacheGroupID: 0,
- cdnID: 2,
+ cdnID: 0,
domainName: "test.net",
hostName: "topologieserver3",
httpsPort: 443,
@@ -434,7 +434,7 @@ export const topologies = {
route:
"/phys_locations",
queryKey: "name",
queryValue:
"TopTestPhys",
- replace:
"physLocationID"
+ replace:
"physicalLocationID"
},
{
route: "/cdns",
diff --git
a/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts
b/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts
index b326f1af46..e55701dadd 100644
--- a/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts
+++ b/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts
@@ -95,7 +95,7 @@ export class DeliveryServicePage extends BasePage {
element(by.name("active")).sendKeys("Active"),
element(by.id("type")).sendKeys(type),
element(by.name("tenantId")).click().then(() =>
element(by.name(tenant)).click()),
- element(by.name("cdn")).sendKeys("dummycdn")
+ element(by.name("cdn")).sendKeys("dummycdn"+randomize)
);
await Promise.all(ps);
