CMR-11368: adding more sync and tweeking time to lower chance of hitting the other testing threads

Author: jceaser

access-control-app/int-test/cmr/access_control/int_test/acl_search_test.clj

@@ -20,7 +20,7 @@
   (fixtures/grant-all-acl-fixture))
 (use-fixtures :once (fixtures/int-test-fixtures))
 
-(deftest invalid-search-test
+(deftest ^:serial invalid-search-test
   (testing "Accept header"
     (testing "Other than JSON is rejected"
       (is (= {:status 400
@@ -59,7 +59,7 @@
                  [{} 0]
                  (partition 2 group-permissions))))
 
-(deftest acl-search-order-test
+(deftest ^:serial acl-search-order-test
   ;; Conforms to requirements set out in CMR-3590, alphabetical order regardless of case
   (let [token (e/login (u/conn-context) "user1")
         acl1 (u/ingest-acl token {:group_permissions [{:user_type "registered" :permissions ["read"]}]
@@ -85,7 +85,7 @@
             "System - GROUP"]
            (map :name (:items (ac/search-for-acls (merge {:token token} (u/conn-context)) {})))))))
 
-(deftest acl-search-permission-test
+(deftest ^:serial acl-search-permission-test
   (let [_token (e/login (u/conn-context) "user1")
         admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1 (u/ingest-group admin-token
@@ -164,7 +164,7 @@
         (is (= (u/acls->search-response 1 [acl7])
                (dissoc response :took)))))))
 
-(deftest acl-search-test
+(deftest ^:serial acl-search-test
   (let [admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1 (u/ingest-group admin-token
                                {:name "group1"}
@@ -271,7 +271,7 @@
                                           {:page_size 3 :page_num 2}
                                           {:token admin-token}) :took))))))
 
-(deftest acl-search-by-any-id-test
+(deftest ^:serial acl-search-by-any-id-test
   (let [token (e/login (u/conn-context) "user1")
         acl1 (u/ingest-acl token (u/catalog-item-acl "All Collections"))
         acl2 (u/ingest-acl token (u/catalog-item-acl "All Granules"))
@@ -297,7 +297,7 @@
                 (:concept-id acl2)
                 "acl3-legacy-guid"]})))
 
-(deftest acl-search-permitted-group-test
+(deftest ^:serial acl-search-permitted-group-test
   (declare group-permissions acls query-map)
   (u/without-publishing-messages
     (let [token (e/login (u/conn-context) "user1")
@@ -456,7 +456,7 @@
                 :content-type :json}
                (ac/search-for-acls (u/conn-context) query {:token token :raw? true}))))))))
 
-(deftest acl-search-by-identity-type-test
+(deftest ^:serial acl-search-by-identity-type-test
   (declare identity-types expected-acls)
   (let [admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1 (u/ingest-group admin-token
@@ -505,7 +505,7 @@
         "Identity type searches are always case-insensitive"
         ["PrOvIdEr"] (concat [fixtures/*fixture-provider-acl*] provider-group-acls)))))
 
-(deftest acl-search-by-target-test
+(deftest ^:serial acl-search-by-target-test
   (declare target)
   (let [token (e/login (u/conn-context) "user1")
         single-instance-acl (u/ingest-acl token
@@ -529,7 +529,7 @@
       "Provider target, case insensitive"
       ["catalog_item_acl"] [fixtures/*fixture-provider-acl*])))
 
-(deftest acl-search-by-permitted-user-test
+(deftest ^:serial acl-search-by-permitted-user-test
   (declare user users)
   (let [admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1 (u/ingest-group admin-token {:name "group1"} ["user1"])
@@ -593,7 +593,7 @@
         "User names are case-insensitive"
         ["USER1"] [fixtures/*fixture-system-acl* fixtures/*fixture-provider-acl* acl-registered-1 acl-registered-2 acl-group1 acl-group2]))))
 
-(deftest acl-search-provider-test
+(deftest ^:serial acl-search-provider-test
   (declare options provider-ids)
   (let [admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1 (u/ingest-group admin-token {:name "group1"} ["user1"])
@@ -675,7 +675,7 @@
        "Multiple providers with empty results using ignore_case=false option"
        ["prov1"] {"options[provider][ignore_case]" false} []))))
 
-(deftest acl-search-multiple-criteria
+(deftest ^:serial acl-search-multiple-criteria
   (let [admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1 (u/ingest-group admin-token {:name "group1"} ["user1"])
         group2 (u/ingest-group admin-token {:name "group2"} ["user2"])
@@ -743,7 +743,7 @@
          :permitted-user "user2"}
         [acl3 fixtures/*fixture-provider-acl* acl5 acl7]))))
 
-(deftest acl-search-with-legacy-group-guid-test
+(deftest ^:serial acl-search-with-legacy-group-guid-test
   (let [admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1-legacy-guid "group1-legacy-guid"
         group1 (u/ingest-group admin-token
@@ -804,7 +804,7 @@
         (is (= (u/acls->search-response (count expected-acls) expected-acls {:include-full-acl true})
                (dissoc response :took)))))))
 
-(deftest acl-reindexing-test
+(deftest ^:serial acl-reindexing-test
   (u/without-publishing-messages
    (let [token (e/login (u/conn-context) "user1")
          acl1 (u/ingest-acl token (assoc (u/system-acl "METRIC_DATA_POINT_SAMPLE")
@@ -850,7 +850,7 @@
                             (count expected-acls-after-reindexing) expected-acls-after-reindexing)))
               (set (:items actual-response))))))))
 
-(deftest acl-search-by-target-group-id-test
+(deftest ^:serial acl-search-by-target-group-id-test
   (let [admin-token (e/login (u/conn-context) "admin" ["AG1200000000-CMR"])
         group1 (u/ingest-group admin-token
                                {:name "group1"}

access-control-app/int-test/cmr/access_control/int_test/enable_disable_test.clj

@@ -63,7 +63,7 @@
 
     ;; disable writes for access control service
     (u/disable-access-control-writes post-options)
-    (Thread/sleep 5000)
+    (Thread/sleep 1000)
 
     (testing "save, update, and delete acl fails after disable"
       (try
@@ -77,7 +77,7 @@
         (finally
           ;; always re-enable writes for access control service
           (u/enable-access-control-writes post-options)
-          (Thread/sleep 5000))))
+          (Thread/sleep 1000))))
 
     (testing "save, upate, and delete acl works after re-enable"
       (let [resp (ac/create-acl (u/conn-context) system-acl {:raw? true :token token})]
@@ -121,7 +121,7 @@
         (finally
           ;; Allways re-eneable writes for access control service, even if there was an exception
           (u/enable-access-control-writes post-options)
-          (Thread/sleep 5000))))
+          (Thread/sleep 1000))))
 
     (testing "save, update, and delete group succeeds after re-enable"
       (let [group3 (u/make-group {:name "group4" :members ["user1" "user5"]})