add: test-manager functionality to skip domain ping tests

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 30daa4d0216d7245d5762971c9cc63739e63c42f..da506a6ae08d1d717689e2947a32ddfdaea7503f 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -17,6 +17,7 @@ import java.util.LinkedList;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
+import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -132,6 +133,8 @@ public class Manager extends Page {
 
     HashMap<String, LinkedList<String>> emails = new HashMap<>();
 
+    private static TreeSet<String> pingExempt = new TreeSet<>();
+
     public static Manager getInstance() {
         if (instance == null) {
             instance = new Manager();
@@ -160,7 +163,7 @@ public class Manager extends Page {
 
     }
 
-    public static class PingerFetcher extends DomainPinger {
+    public class PingerFetcher extends DomainPinger {
 
         private DomainPingType dpt;
 
@@ -171,7 +174,11 @@ public class Manager extends Page {
         @Override
         public void ping(Domain domain, String configuration, CertificateOwner target, int confId) {
             System.out.println("Test: " + domain);
-            dps.get(dpt).ping(domain, configuration, target, confId);
+            if (pingExempt.contains(domain.getSuffix())) {
+                enterPingResult(confId, DomainPinger.PING_SUCCEDED, "Succeeded by TestManager pass-by", null);
+            } else {
+                dps.get(dpt).ping(domain, configuration, target, confId);
+            }
         }
 
     }
@@ -308,6 +315,16 @@ public class Manager extends Page {
                 resp.getWriter().println("interrupted");
             }
 
+        } else if (req.getParameter("addExDom") != null) {
+            String dom = req.getParameter("exemtDom");
+            pingExempt.add(dom);
+            resp.getWriter().println("Updated domains exempt from pings. Current set: <br/>");
+            resp.getWriter().println(pingExempt);
+        } else if (req.getParameter("delExDom") != null) {
+            String dom = req.getParameter("exemtDom");
+            pingExempt.remove(dom);
+            resp.getWriter().println("Updated domains exempt from pings. Current set: <br/>");
+            resp.getWriter().println(pingExempt);
         }
     }
 

diff --git a/util-testing/org/cacert/gigi/pages/Manager.templ b/util-testing/org/cacert/gigi/pages/Manager.templ
index 2bfe725e81347d2a0206665caa39733b84ea8efb..434ccf97c3f4cd946b99b85e209726eaa599681d 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.templ
+++ b/util-testing/org/cacert/gigi/pages/Manager.templ
@@ -1,15 +1,21 @@
 <form method='post'>
+<table>
+<tr><td>
 Batch create users:
+</td><td></td><td>
 <div>
   Email: 
   <input type="text" name="prefix"/> NNN@
   <input type="text" name="suffix"/>
 </div>
 Amount:  <input type="slider" name="amount"/> <input type="submit" name="create" value="Create Users"/>
-</form>
-<form method='post'>
+</td></tr>
+
+<tr><td>
 Add privilege:
+</td><td>
 Email: <input type="text" name="email"/> 
+</td><td>
 <select name="priv">
 <option>supporter</option>
 <option>arbitrator</option>
@@ -23,36 +29,54 @@ Email: <input type="text" name="email"/>
 </select>
 <input type="submit" name="addpriv" value="Grant Privillege"/>
 <input type="submit" name="delpriv" value="Revoke Privillege"/>
-</form>
+</td><tr>
 
-<form method='post'>
+<tr><td>
 Receive Mails:
+</td><td>
 Email: <input type="text" name="femail"/>
+</td><td>
 <input type="submit" value="Receive Mails" name="fetch"/>
-</form>
+</td><tr>
 
-<form method='post'>
+<tr><td>
 Add CATs entry:
+</td><td>
 Email: <input type="text" name="catsEmail"/>
+</td><td>
 <input type="submit" value="Add CATs" name="cats"/>
-</form>
-
-
-<form method='post'>
+</td></tr>
+<tr><td>
 Add 100 Assurance points:
+</td><td>
 Email: <input type="text" name="assureEmail"/>
+</td><td>
 <input type="submit" value="Assure 100 Points" name="assure"/>
-</form>
+</td></tr>
 
-<form method='post'>
+<tr><td>
 Add verified Email:
+</td><td>
 Email: <input type="text" name="addEmailEmail"/>
+</td><td>
 new Email: <input type="text" name="addEmailNew"/>
 <input type="submit" value="Add verified Email" name="addEmail"/>
-</form>
+</td></tr>
 
-<form method='post'>
+<tr><td>
 Add Client Cert:
+</td><td>
 Email: <input type="text" name="addCertEmail"/>
+</td><td>
 <input type="submit" value="Add an certificate" name="addCert"/>
-</form>
+</td></tr>
+
+<tr><td>
+Exempt Domain from Pinging:
+</td><td>
+</td><td>
+Domain: <input type="text" name="exemtDom"/>
+<input type="submit" value="Add a domain from exemption" name="addExDom"/>
+<input type="submit" value="Remove a domain from exemption" name="delExDom"/>
+</td></tr>
+</table>
\ No newline at end of file