Adapt bdep-publish and bdep-ci tests to diagnostics change

2 files changed, 32 insertions, 16 deletions

diff --git a/tests/ci.test b/tests/ci.test
index e2d1275..f398c5e 100644
--- a/tests/ci.test
+++ b/tests/ci.test
@@ -71,7 +71,8 @@ windows = ($cxx.target.class == 'windows')
     $* 2>>~"%EOE%"
       submitting to $server
       %.*
-      %CI request is queued\(.+\)%
+      %CI request is queued.*%
+      %reference: .+%
       EOE
   }
 
@@ -154,7 +155,8 @@ windows = ($cxx.target.class == 'windows')
     $* 2>>~"%EOE%"
       submitting to $server
       %.*
-      %CI request is queued\(.+\)%
+      %CI request is queued.*%
+      %reference: .+%
       EOE
   }
 
@@ -171,7 +173,8 @@ windows = ($cxx.target.class == 'windows')
     $* 2>>~"%EOE%"
       submitting to $server
       %.*
-      %CI request is queued\(.+\)%
+      %CI request is queued.*%
+      %reference: .+%
       EOE
   }
 
@@ -196,7 +199,8 @@ windows = ($cxx.target.class == 'windows')
         package: prj
         version: 1.0.1
       %.*
-      %CI request is queued\(.+\)%
+      %CI request is queued.*%
+      %reference: .+%
       EOE
   }
 }
diff --git a/tests/publish.test b/tests/publish.test
index 0861931..880c538 100644
--- a/tests/publish.test
+++ b/tests/publish.test
@@ -65,7 +65,8 @@ windows = ($cxx.target.class == 'windows')
           upgrade prj/1.0.1
         submitting prj-1.0.1.tar.gz
         %.*
-        %(prj/1\.0\.1 )?submission is queued \(.{12}\)%
+        %(prj/1\.0\.1 )?submission is queued%
+        %reference: .{12}%
         EOE
     }
 
@@ -111,10 +112,12 @@ windows = ($cxx.target.class == 'windows')
       $* 2>>~%EOE%
         submitting libprj-1.0.2.tar.gz
         %.*
-        %libprj/1.0.2 submission is queued \(.{12}\)%
+        %(libprj/1\.0\.2 )?submission is queued%
+        %reference: .{12}%
         submitting prj-1.0.2.tar.gz
         %.*
-        %prj/1\.0\.2 submission is queued \(.{12}\)%
+        %(prj/1\.0\.2 )?submission is queued%
+        %reference: .{12}%
         EOE
     }
 
@@ -132,7 +135,8 @@ windows = ($cxx.target.class == 'windows')
       $* 2>>~%EOE%
         submitting libprj-1.0.3.tar.gz
         %.*
-        %libprj/1.0.3 submission is queued \(.{12}\)%
+        %(libprj/1\.0\.3 )?submission is queued%
+        %reference: .{12}%
         EOE
     }
 
@@ -164,10 +168,12 @@ windows = ($cxx.target.class == 'windows')
           section: stable
         continue? [y/n] submitting libprj-1.0.4.tar.gz
         %.*
-        %libprj/1.0.4 submission is queued \\\(.{12}\\\)%
+        %\(libprj/1\\.0\\.4 \)?submission is queued%
+        %reference: .{12}%
         submitting prj-1.0.4.tar.gz
         %.*
-        %prj/1\.0\.4 submission is queued \\\(.{12}\\\)%
+        %\(prj/1\\.0\\.4 \)?submission is queued%
+        %reference: .{12}%
         EOE
     }
   }
@@ -284,7 +290,8 @@ windows = ($cxx.target.class == 'windows')
       %.*
       submitting prj-1.0.8.tar.gz
       %.*
-      %prj/1\.0\.8 submission is queued \(.{12}\)%
+      %(prj/1\.0\.8 )?submission is queued%
+      %reference: .{12}%
       EOE
 
     # Publish when both local and remote-tracking build2-control branches are
@@ -299,7 +306,8 @@ windows = ($cxx.target.class == 'windows')
       %.*
       submitting prj-1.0.9.tar.gz
       %.*
-      %prj/1\.0\.9 submission is queued \(.{12}\)%
+      %(prj/1\.0\.9 )?submission is queued%
+      %reference: .{12}%
       EOE
 
     # Publish when the local build2-control branch is not present while the
@@ -316,7 +324,8 @@ windows = ($cxx.target.class == 'windows')
       %.*
       submitting prj-1.0.10.tar.gz
       %.*
-      %prj/1\.0\.10 submission is queued \(.{12}\)%
+      %(prj/1\.0\.10 )?submission is queued%
+      %reference: .{12}%
       EOE
 
     # Check for the build2-control branch commits presence and the files they
@@ -397,7 +406,8 @@ windows = ($cxx.target.class == 'windows')
       %.*
       submitting prj-1.0.12.tar.gz
       %.*
-      %prj/1\.0\.12 submission is queued \(.{12}\)%
+      %(prj/1\.0\.12 )?submission is queued%
+      %reference: .{12}%
       EOE
 
     sed -i -e 's/^(version:) .*$/\1 1.0.13/' prj/manifest;
@@ -414,7 +424,8 @@ windows = ($cxx.target.class == 'windows')
       %.*
       submitting prj-1.0.13.tar.gz
       %.*
-      %prj/1\.0\.13 submission is queued \(.{12}\)%
+      %(prj/1\.0\.13 )?submission is queued%
+      %reference: .{12}%
       EOE
 
     # Test publishing after implicit fetches.
@@ -454,7 +465,8 @@ windows = ($cxx.target.class == 'windows')
       %.*
       submitting prj-1.0.14.tar.gz
       %.*
-      %prj/1\.0\.14 submission is queued \(.{12}\)%
+      %(prj/1\.0\.14 )?submission is queued%
+      %reference: .{12}%
       EOE
 
     # Check the build2-control branch commits presence and the files they add.