From 589d05a894d8a79939952c3d114c556db5b195c7 Mon Sep 17 00:00:00 2001 From: Yogi_Wang Date: Thu, 16 Apr 2020 10:00:11 +0800 Subject: [PATCH] nightly move switch scanner case to mutiple-scanner file Signed-off-by: Yogi_Wang --- tests/robot-cases/Group1-Nightly/Trivy.robot | 32 ----------------- .../robot-cases/Group1-Nightly/Upgrade.robot | 2 +- .../Group1-Nightly/multi_scanners.robot | 34 ++++++++++++++++++- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/tests/robot-cases/Group1-Nightly/Trivy.robot b/tests/robot-cases/Group1-Nightly/Trivy.robot index 433835391..90642f6ac 100644 --- a/tests/robot-cases/Group1-Nightly/Trivy.robot +++ b/tests/robot-cases/Group1-Nightly/Trivy.robot @@ -153,35 +153,3 @@ Test Case - Verfiy Project Level CVE Whitelist Test Case - Verfiy Project Level CVE Whitelist By Quick Way of Add System Body Of Verfiy Project Level CVE Whitelist By Quick Way of Add System goharbor/harbor-portal 2cb6a1c24dd6b88f11fd44ccc6560cb7be969f8ac5f752802c99cae6bcd592bb CVE-2019-19317\nCVE-2019-19646 \nCVE-2019-5188 \nCVE-2019-20387 \nCVE-2019-17498 \nCVE-2019-20372 \nCVE-2019-19244 \nCVE-2019-19603 \nCVE-2019-19880 \nCVE-2019-19923 \nCVE-2019-19925 \nCVE-2019-19926 \nCVE-2019-19959 \nCVE-2019-20218 \nCVE-2019-19232 \nCVE-2019-19234 \nCVE-2019-19645 \nCVE-2019-18276 - -Test Case - Switch Scanner - Init Chrome Driver - Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} - ${d}= get current date result_format=%m%s - - Switch To Scanners Page - - Should Display The Default Trivy Scanner - - Create An New Project project${d} - Go Into Project project${d} has_image=${false} - Push Image ${ip} admin Harbor12345 project${d} hello-world:latest - Go Into Project project${d} - Go Into Repo project${d}/hello-world - Scan Repo latest Fail - View Scan Error Log - - Switch To Scanners Page - - Set Default Scanner Clair - Should Display The Default Clair Scanner - - Go Into Project project${d} - Go Into Repo project${d}/hello-world - Scan Repo latest Succeed - Move To Summary Chart - Wait Until Page Contains No vulnerability - - Switch To Scanners Page - Set Default Scanner Trivy - Close Browser \ No newline at end of file diff --git a/tests/robot-cases/Group1-Nightly/Upgrade.robot b/tests/robot-cases/Group1-Nightly/Upgrade.robot index 406a4ab3f..f544378e5 100644 --- a/tests/robot-cases/Group1-Nightly/Upgrade.robot +++ b/tests/robot-cases/Group1-Nightly/Upgrade.robot @@ -27,7 +27,7 @@ Test Case - Manage project publicity Body Of Manage project publicity Test Case - Scan A Tag In The Repo - Body Of Scan A Tag In The Repo hello-world latest + Body Of Scan A Tag In The Repo hello-world latest Test Case - List Helm Charts Body Of List Helm Charts diff --git a/tests/robot-cases/Group1-Nightly/multi_scanners.robot b/tests/robot-cases/Group1-Nightly/multi_scanners.robot index 6a5872527..96523cd31 100644 --- a/tests/robot-cases/Group1-Nightly/multi_scanners.robot +++ b/tests/robot-cases/Group1-Nightly/multi_scanners.robot @@ -26,4 +26,36 @@ ${HARBOR_ADMIN} admin *** Test Cases *** Test Case - Get Harbor Version #Just get harbor version and log it - Get Harbor Version \ No newline at end of file + Get Harbor Version + +Test Case - Switch Scanner + Init Chrome Driver + Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} + ${d}= get current date result_format=%m%s + + Switch To Scanners Page + + Should Display The Default Trivy Scanner + + Create An New Project project${d} + Go Into Project project${d} has_image=${false} + Push Image ${ip} admin Harbor12345 project${d} hello-world:latest + Go Into Project project${d} + Go Into Repo project${d}/hello-world + Scan Repo latest Fail + View Scan Error Log + + Switch To Scanners Page + + Set Default Scanner Clair + Should Display The Default Clair Scanner + + Go Into Project project${d} + Go Into Repo project${d}/hello-world + Scan Repo latest Succeed + Move To Summary Chart + Wait Until Page Contains No vulnerability + + Switch To Scanners Page + Set Default Scanner Trivy + Close Browser \ No newline at end of file