Fix test for request conflict with SSNv2

The test for request conflict with SSNv2 has been updated to
create a duplicate request with the proper requestId attribute.
With this change the CLI is no longer failing, but it still
does not create a new request as expected.

.github/workflows/ca-ssnv2-test.yml

@@ -1265,8 +1265,8 @@ jobs:
       # should be created with a new ID, leaving the conflicting request intact,
       # and a new cert should be issued as usual.
       #
-      # However, currently there is no new request created, the conflicting
-      # request is changed to pending, and the CLI is failing.
+      # However, currently the CA reuses the conflicting request so there is no
+      # new request created.
 
       - name: Create a request with the next ID
         if: always()
@@ -1283,7 +1283,7 @@ jobs:
 
           sed -i \
               -e "s/^dn: cn=37,/dn: cn=38,/" \
-              -e "s/^serialno: 0237/serialno: 0238/" \
+              -e "s/^requestId: 0237/requestId: 0238/" \
               -e "s/^cn: 37/cn: 38/" \
               request.ldif
 
@@ -1297,20 +1297,13 @@ jobs:
       - name: Enroll a cert with a conflicting request ID
         if: always()
         run: |
+          # the CLI should complete successfully
           docker exec pki pki \
               -n caadmin \
               ca-cert-issue \
               --profile caUserCert \
               --csr-file testuser.csr \
-              --output-file testuser.crt \
-              > >(tee stdout) 2> >(tee stderr >&2) || true
-
-          # the CLI should complete successfully, but currently it's failing
-          cat > expected << EOF
-          ERROR: Request pending
-          EOF
-
-          diff expected stderr
+              --output-file testuser.crt
 
       - name: Check requests
         if: always()