libpcp, qa: fix regression in 766, 776 re webapi discovery

Resolve failures in discovery tests due to incorrect string interpolation in libpcp.
performancecopilot · Jun 28, 2019 · 8abd93d · 8abd93d
1 parent ea81f5f
commit 8abd93d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/qa/766 b/qa/766
@@ -26,9 +26,9 @@ _sought_filter()
     # output for the --all invocations
     sed \
 	-e 's/No \(pmproxy servers\) discovered/Sought \1/g' \
-	-e 's/No \(pmwebd servers\) discovered/Sought \1/g' \
+	-e 's/No \(pmwebapi servers\) discovered/Sought \1/g' \
 	-e 's/Discovered \(pmproxy servers\):/Sought \1/g' \
-	-e 's/Discovered \(pmwebd servers\):/Sought \1/g' \
+	-e 's/Discovered \(pmwebapi servers\):/Sought \1/g' \
     # end
 }
 

diff --git a/qa/776 b/qa/776
@@ -29,9 +29,9 @@ _sought_filter()
     # output for the --all invocations
     sed \
 	-e 's/No \(pmproxy servers\) discovered/Sought \1/g' \
-	-e 's/No \(pmwebd servers\) discovered/Sought \1/g' \
+	-e 's/No \(pmwebapi servers\) discovered/Sought \1/g' \
 	-e 's/Discovered \(pmproxy servers\):/Sought \1/g' \
-	-e 's/Discovered \(pmwebd servers\):/Sought \1/g' \
+	-e 's/Discovered \(pmwebapi servers\):/Sought \1/g' \
     # end
 }
 

diff --git a/src/libpcp/src/auxserver.c b/src/libpcp/src/auxserver.c
@@ -186,7 +186,7 @@ __pmWebAPIAddPorts(int **ports, int nports)
      * error.
      */
     if (new_nports <= nports)
-	new_nports = __pmAddPorts(TO_STRING(PMWEBAPI_PORT), ports, nports);
+	new_nports = __pmAddPorts(TO_STRING(WEBAPI_PORT), ports, nports);
 
     return new_nports;
 }