(PDB-4836) Return false not null for write_db_up?.

Author: rbrw

src/puppetlabs/puppetdb/status.clj

@@ -44,7 +44,7 @@
     {:maintenance_mode? (maint-mode-fn?)
      :queue_depth (utils/nil-on-failure (mq/queue-size))
      :read_db_up? (sutils/db-up? (:scf-read-db globals))
-     :write_db_up? (some identity db-up)
+     :write_db_up? (boolean (some identity db-up))
      :write_dbs_up? (every? identity db-up)
      :write_db db-status}))
 

test/puppetlabs/puppetdb/status_test.clj

@@ -1,43 +1,62 @@
 (ns puppetlabs.puppetdb.status-test
   (:require [clojure.test :refer :all]
+            [puppetlabs.puppetdb.scf.storage-utils :as sutils]
             [puppetlabs.puppetdb.testutils :as tu]
             [puppetlabs.puppetdb.utils :refer [base-url->str-with-prefix]]
             [puppetlabs.puppetdb.cheshire :as json]
             [clj-http.client :as client]
             [puppetlabs.puppetdb.testutils.services :as svc-utils]))
 
-(deftest status-test
-  (testing "status returns as expected on normal operation"
+(deftest normal-status
+  (svc-utils/with-puppetdb-instance
+    (let [{:keys [body] :as pdb-resp} (-> svc-utils/*base-url*
+                                          (assoc :prefix "/status/v1/services")
+                                          base-url->str-with-prefix
+                                          client/get)
+          pdb-status (:puppetdb-status (json/parse-string body true))]
+      (tu/assert-success! pdb-resp)
+      (is (= "running" (:state pdb-status)))
+      (is (= {:maintenance_mode? false
+              :read_db_up? true
+              :write_db_up? true
+              :write_dbs_up? true
+              :write_db {:default {:up? true}}
+              :queue_depth 0}
+             (:status pdb-status))))))
+
+(deftest maintenance-mode-status
+  (with-redefs [puppetlabs.puppetdb.pdb-routing/maint-mode? (constantly true)]
     (svc-utils/with-puppetdb-instance
-      (let [{:keys [body] :as pdb-resp} (-> svc-utils/*base-url*
-                                            (assoc :prefix "/status/v1/services")
-                                            base-url->str-with-prefix
-                                            client/get)
+      (let [{:keys [body status]} (-> svc-utils/*base-url*
+                                      (assoc :prefix "/status/v1/services")
+                                      base-url->str-with-prefix
+                                      (client/get {:throw-exceptions false}))
             pdb-status (:puppetdb-status (json/parse-string body true))]
-        (tu/assert-success! pdb-resp)
-        (is (= "running" (:state pdb-status)))
-        (is (= {:maintenance_mode? false
+        (is (= 503 status))
+        (is (= "starting" (:state pdb-status)))
+        (is (= {:maintenance_mode? true
                 :read_db_up? true
                 :write_db_up? true
                 :write_dbs_up? true
                 :write_db {:default {:up? true}}
                 :queue_depth 0}
-               (:status pdb-status))))))
+               (:status pdb-status)))))))
 
-  (testing "status returns as expected when in maintenance mode"
-    (with-redefs [puppetlabs.puppetdb.pdb-routing/maint-mode? (constantly true)]
-      (svc-utils/with-puppetdb-instance
-        (let [{:keys [body status]} (-> svc-utils/*base-url*
-                                        (assoc :prefix "/status/v1/services")
-                                        base-url->str-with-prefix
-                                        (client/get {:throw-exceptions false}))
-              pdb-status (:puppetdb-status (json/parse-string body true))]
-          (is (= 503 status))
-          (is (= "starting" (:state pdb-status)))
-          (is (= {:maintenance_mode? true
-                  :read_db_up? true
-                  :write_db_up? true
-                  :write_dbs_up? true
-                  :write_db {:default {:up? true}}
-                  :queue_depth 0}
-                 (:status pdb-status))))))))
+(deftest status-when-databases-down
+  ;; FIXME: better test
+  (svc-utils/with-puppetdb-instance
+    (with-redefs [sutils/db-up? (constantly false)]
+      (let [{:keys [body status]} (-> svc-utils/*base-url*
+                                      (assoc :prefix "/status/v1/services")
+                                      base-url->str-with-prefix
+                                      (client/get {:throw-exceptions false}))
+            pdb-status (:puppetdb-status (json/parse-string body true))]
+        (is (= 503 status))
+        (is (= "error" (:state pdb-status)))
+        (is (= {:maintenance_mode? false
+                :read_db_up? false
+                :write_db_up? false
+                :write_dbs_up? false
+                :write_db {:default {:up? false}}
+                :queue_depth 0}
+               (:status pdb-status)))))))