diff of ec24e5aba9a0eb993f3421099047d60cc59a6a0d

ec24e5aba9a0eb993f3421099047d60cc59a6a0d
diff --git a/run_tests.lisp b/run_tests.lisp
index 4f3f496..7752643 100644
--- a/run_tests.lisp
+++ b/run_tests.lisp
@@ -4,3 +4,6 @@
 (format t "loading murja ~%")
 (ql:quickload :aggressive-murja)
 (ql:quickload :aggressive-murja/tests)
+
+(unless (fiveam:run! 'murja.tests:main-suite)
+  (sb-ext:exit :code 666))
diff --git a/src/main.lisp b/src/main.lisp
index 1dc4aae..2f9dac7 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -3,7 +3,7 @@
   (:import-from :murja.posts.post-db)
   (:import-from :murja.middleware.db :with-db)
   (:import-from :murja.migrations :migrate)
-  (:export :main :start-server))
+  (:export :main :start-server :stop-server))
 
 (in-package :murja)
 
@@ -11,26 +11,28 @@
 
 (defun stop-server ()
   (when *server*
-    (hunchentoot:stop *server*))
-  (when (and (find-package 'murja.newui)
-	     murja.newui:*server*)
-    (hunchentoot:stop murja.newui:*server*)))
+    (hunchentoot:stop *server*)
+    (setf *server* nil))
+  (when murja.newui:*server*
+    (hunchentoot:stop murja.newui:*server*)
+    (setf murja.newui:*server* nil)))
 
 (defun start-server (&key (port 3010) stream)
   (format t "Starting murja server~%")
   (with-db
       (migrate))
-  (let ((server (make-instance 'easy-routes:easy-routes-acceptor :port port)))
+  (let ((server (make-instance 'easy-routes:easy-routes-acceptor :port port))
+	(ws-server (make-instance 'hunchensocket:websocket-acceptor :port (1+ port))))
 
     (when stream
       (setf (hunchentoot:acceptor-access-log-destination server) stream))
     
-    (when (equalp 3010 port)
-      (setf *server* server))
+    
+    (setf *server* server)
+    (setf murja.newui:*server* ws-server)
     
     (hunchentoot:start server)
-    (when (find-package 'murja.newui)
-      (hunchentoot:start murja.newui:*server*))
+    (hunchentoot:start murja.newui:*server*)
     (format t "Started murja server on ~a ~%" port)
     server))
 
diff --git a/src/murja-newui/newui.lisp b/src/murja-newui/newui.lisp
index d539e7e..43e1a0a 100644
--- a/src/murja-newui/newui.lisp
+++ b/src/murja-newui/newui.lisp
@@ -59,7 +59,7 @@
             do (let ((*current-ws* peer))
 		 (call-event sessionid call-dst)))))
 
-(defparameter *server* (make-instance 'hunchensocket:websocket-acceptor :port 3011))
+(defparameter *server* nil)
 ;;(hunchentoot:stop *server*)
 ;;(hunchentoot:start *server*)
 
diff --git a/test/literal-test.lisp b/test/literal-test.lisp
index 2d97d75..173b868 100644
--- a/test/literal-test.lisp
+++ b/test/literal-test.lisp
@@ -36,6 +36,6 @@
 		(macroexpand `(literal Dumb documentation (with a parenthesis-wrapped block) that 666 returns this !L (format t "lol~%") code )))))
 
 
-(if (and (sb-ext:posix-getenv "GHA")
-	 (not (run! 'literal-suite)))
-    (sb-ext:exit :code 666))
+;; (if (and (sb-ext:posix-getenv "GHA")
+;; 	 (not (run! 'literal-suite)))
+;;     (sb-ext:exit :code 666))
diff --git a/test/post.lisp b/test/post.lisp
index c35762c..91aee0a 100644
--- a/test/post.lisp
+++ b/test/post.lisp
@@ -83,7 +83,7 @@
 		(postmodern:execute "DROP TABLE IF EXISTS public.ragtime_migrations")
 		(postmodern:execute "DROP TABLE IF EXISTS public.migrations_tracker")
 		(murja.migrations:migrate)
-		(postmodern:insert-dao *test-user*)
+		(postmodern:upsert-dao *test-user*)
 		(mapcar #'postmodern:insert-dao *test-posts*)
 		(setup-previouslies)
 		
diff --git a/test/session-tests.lisp b/test/session-tests.lisp
index e8d578c..e12ab54 100644
--- a/test/session-tests.lisp
+++ b/test/session-tests.lisp
@@ -98,8 +98,3 @@ ON CONFLICT DO NOTHING")
 	(is (equalp 401 status))))))
 
 ;; (setf fiveam:*run-test-when-defined* t)
-
-
-(if (and (sb-ext:posix-getenv "GHA")
-	 (not (run! 'main-suite)))
-    (sb-ext:exit :code 666))
diff --git a/test/tests.lisp b/test/tests.lisp
index e19f526..68f3496 100644
--- a/test/tests.lisp
+++ b/test/tests.lisp
@@ -32,8 +32,8 @@
 	(postmodern:execute "DROP SCHEMA IF EXISTS blog CASCADE;")
 	(postmodern:execute "DROP TABLE IF EXISTS public.ragtime_migrations")
 	(postmodern:execute "DROP TABLE IF EXISTS public.migrations_tracker")
-	(when *test-server*
-	  (hunchentoot:stop *test-server*))
+
+	(murja:stop-server)
 	(setf *test-server* nil)
 	(setf lisp-fixup:*dev?* nil)
 	(setf murja.middleware.db:*automatic-tests-on?* nil))))