Attempt to fix tests

certidude/cli.py

@@ -1052,7 +1052,8 @@ def certidude_cron():
 @click.command("serve", help="Run server")
 @click.option("-p", "--port", default=8080 if os.getuid() else 80, help="Listen port")
 @click.option("-l", "--listen", default="0.0.0.0", help="Listen address")
-def certidude_serve(port, listen):
+@click.option("-f", "--fork", default=False, is_flag=True, help="Fork to background")
+def certidude_serve(port, listen, fork):
     from certidude.signer import SignServer
     from certidude import const
     click.echo("Using configuration from: %s" % const.CONFIG_PATH)
@@ -1189,15 +1190,15 @@ def certidude_serve(port, listen):
         for handler in log_handlers:
             logger.addHandler(handler)
 
-    import atexit
 
     def exit_handler():
         logging.getLogger("cli").debug("Shutting down Certidude")
-
+    import atexit
     atexit.register(exit_handler)
-
     logging.getLogger("cli").debug("Started Certidude at %s", const.FQDN)
-    httpd.serve_forever()
+
+    if not fork or not os.fork():
+        httpd.serve_forever()
 
 @click.group("strongswan", help="strongSwan helpers")
 def certidude_setup_strongswan(): pass

certidude/templates/certidude-server.conf

@@ -107,10 +107,14 @@ renewal allowed = false
 
 [push]
 event source token = {{ push_token }}
-event source subscribe = {{ push_server }}/ev/sub/%s
-event source publish = {{ push_server }}/ev/pub/%s
-long poll subscribe = {{ push_server }}/lp/sub/%s
-long poll publish = {{ push_server }}/lp/pub/%s
+event source subscribe =
+;event source subscribe = {{ push_server }}/ev/sub/%s
+event source publish =
+;event source publish = {{ push_server }}/ev/pub/%s
+long poll subscribe =
+;long poll subscribe = {{ push_server }}/lp/sub/%s
+long poll publish =
+;long poll publish = {{ push_server }}/lp/pub/%s
 
 [authority]
 # Present form for CSR submission for logged in users
@@ -141,7 +145,8 @@ signed dir = {{ directory }}/signed/
 revoked dir = {{ directory }}/revoked/
 expired dir = {{ directory }}/expired/
 
-outbox uri = {{ outbox }}
+outbox uri =
+;outbox uri = {{ outbox }}
 outbox sender name = Certificate management
 outbox sender address = certificates@example.com