[ARVADOS-WORKBENCH2] updated: 2.3.0-147-g281300c8

[Git user]

Summary of changes:
 cypress/integration/virtual-machine-admin.spec.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

       via  281300c86c615248d124c8b5bb6b7a3461b63349 (commit)
       via  bdf8aade1be61bafe65e4226a1eae86a1a6d8499 (commit)
      from  5b88c131a4bbff645ab7791ce9d6c2e3dcca49a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 281300c86c615248d124c8b5bb6b7a3461b63349
Author: Stephen Smith <stephen at curii.com>
Date:   Thu Jan 27 10:06:19 2022 -0500

    18284: Make vm cypress test users unique to avoid race conditions
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/cypress/integration/virtual-machine-admin.spec.js b/cypress/integration/virtual-machine-admin.spec.js
index ee4ff992..d057ce49 100644
--- a/cypress/integration/virtual-machine-admin.spec.js
+++ b/cypress/integration/virtual-machine-admin.spec.js
@@ -13,12 +13,12 @@ describe('Virtual machine login manage tests', function() {
         // aliases are cleaned up after every test. Also it doesn't make sense
         // to set the same users on beforeEach() over and over again, so we
         // separate a little from Cypress' 'Best Practices' here.
-        cy.getUser('admin', 'Admin', 'User', true, true)
+        cy.getUser('admin', 'VMAdmin', 'User', true, true)
             .as('adminUser').then(function() {
                 adminUser = this.adminUser;
             }
         );
-        cy.getUser('user', 'Active', 'User', false, true)
+        cy.getUser('user', 'VMActive', 'User', false, true)
             .as('activeUser').then(function() {
                 activeUser = this.activeUser;
             }
@@ -47,7 +47,7 @@ describe('Virtual machine login manage tests', function() {
                   .contains('Search for users')
                   .parent()
                   .within(() => {
-                    cy.get('input').type('admin');
+                    cy.get('input').type('VMAdmin');
                   })
             });
         cy.get('[role=tooltip]').click();
@@ -85,7 +85,7 @@ describe('Virtual machine login manage tests', function() {
                   .contains('Search for users')
                   .parent()
                   .within(() => {
-                    cy.get('input').type('active user');
+                    cy.get('input').type('VMActive user');
                   })
             });
         cy.get('[role=tooltip]').click();
@@ -134,7 +134,6 @@ describe('Virtual machine login manage tests', function() {
 
         cy.get('[data-cy=vm-admin-table]')
             .contains('user'); // Wait for page to finish
-        cy.wait(3000);
 
         cy.get('[data-cy=vm-admin-table]')
             .contains(vmHost)
@@ -153,7 +152,7 @@ describe('Virtual machine login manage tests', function() {
                 cy.get('div[role=button]').should('have.length', 1)
             });
 
-            cy.get('@vmRow')
+        cy.get('@vmRow')
             .find('div[role=button]')
             .contains('admin')
             .parents('[role=button]')

commit bdf8aade1be61bafe65e4226a1eae86a1a6d8499
Author: Stephen Smith <stephen at curii.com>
Date:   Thu Jan 27 00:44:26 2022 -0500

    18284: Try to fix flakey test
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/cypress/integration/virtual-machine-admin.spec.js b/cypress/integration/virtual-machine-admin.spec.js
index ea39d460..ee4ff992 100644
--- a/cypress/integration/virtual-machine-admin.spec.js
+++ b/cypress/integration/virtual-machine-admin.spec.js
@@ -134,6 +134,7 @@ describe('Virtual machine login manage tests', function() {
 
         cy.get('[data-cy=vm-admin-table]')
             .contains('user'); // Wait for page to finish
+        cy.wait(3000);
 
         cy.get('[data-cy=vm-admin-table]')
             .contains(vmHost)

-----------------------------------------------------------------------


hooks/post-receive
--