From ec070f19c77e315231c63be165643ac0e1c4e401 Mon Sep 17 00:00:00 2001 From: Afreen Misbah Date: Fri, 14 Jun 2024 10:51:47 +0530 Subject: [PATCH] mgr/dashboard: fix service page e2e tests - service page now uses defaults value for the placement count due to which mds test failing - in test we pass "1" while "2" which is the default count for mds is already populated, making it 21 and causing unable to create mds service Fixes: https://tracker.ceph.com/issues/66540 Signed-off-by: Afreen Misbah (cherry picked from commit 5a718229dc43953f140a16342f19523a1c075863) (cherry picked from commit 1da0a4f8cb234ef84729c24cc9a82397361e9534) Conflicts: src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.e2e-spec.ts src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts --- .../frontend/cypress/e2e/cluster/services.po.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts index 3db483a16a2..e1a3a002548 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/services.po.ts @@ -49,7 +49,9 @@ export class ServicesPageHelper extends PageHelper { switch (serviceType) { case 'rgw': cy.get('#service_id').type('foo'); - unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count)); + unmanaged + ? cy.get('label[for=unmanaged]').click() + : cy.get('#count').clear().type(String(count)); break; case 'ingress': @@ -65,12 +67,16 @@ export class ServicesPageHelper extends PageHelper { case 'nfs': cy.get('#service_id').type('testnfs'); - unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count)); + unmanaged + ? cy.get('label[for=unmanaged]').click() + : cy.get('#count').clear().type(String(count)); break; case 'smb': cy.get('#service_id').type('testsmb'); - unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count)); + unmanaged + ? cy.get('label[for=unmanaged]').click() + : cy.get('#count').clear().type(String(count)); cy.get('#cluster_id').type('cluster_foo'); cy.get('#config_uri').type('rados://.smb/foo/scc.toml'); break; @@ -96,7 +102,9 @@ export class ServicesPageHelper extends PageHelper { default: cy.get('#service_id').type('test'); - unmanaged ? cy.get('label[for=unmanaged]').click() : cy.get('#count').type(String(count)); + unmanaged + ? cy.get('label[for=unmanaged]').click() + : cy.get('#count').clear().type(String(count)); break; } if (serviceType === 'snmp-gateway') { -- 2.39.5