CMR-11368 - bamboo test 4

Author: jceaser

system-int-test/test/cmr/system_int_test/access_control/acl_search_test.clj

@@ -20,7 +20,7 @@
   (fixtures/grant-all-acl-fixture))
 (use-fixtures :once (fixtures/int-test-fixtures))
 
-(deftest ^:disruptive ^:serial invalid-search-test
+(deftest ^:serial invalid-search-test
   (testing "Accept header"
     (testing "Other than JSON is rejected"
       (is (= {:status 400
@@ -59,14 +59,7 @@
                  [{} 0]
                  (partition 2 group-permissions))))
 
-(comment
-
-  (generate-query-map-for-group-permissions
-     ["guest" "read" "AG10000-PROV1" "create" "registered" "order"])
-
-  )
-
-(deftest ^:disruptive ^:serial 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"]}]
@@ -92,7 +85,7 @@
             "System - GROUP"]
            (map :name (:items (ac/search-for-acls (merge {:token token} (u/conn-context)) {})))))))
 
-(deftest ^:disruptive ^:serial 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
@@ -171,7 +164,7 @@
         (is (= (u/acls->search-response 1 [acl7])
                (dissoc response :took)))))))
 
-(deftest ^:disruptive ^:serial 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"}
@@ -278,7 +271,7 @@
                                           {:page_size 3 :page_num 2}
                                           {:token admin-token}) :took))))))
 
-(deftest ^:disruptive ^:serial 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"))
@@ -304,14 +297,10 @@
                 (:concept-id acl2)
                 "acl3-legacy-guid"]})))
 
-(deftest ^:disruptive ^:serial acl-search-permitted-group-test
+(deftest ^:serial acl-search-permitted-group-test
   (declare group-permissions acls query-map)
   (u/without-publishing-messages
-   (println "🚀 --------------------------------")
-   (println "🚀 - here outside of let")
-   (let [_ (println "🚀 - here inside of let")
-         token (e/login (u/conn-context) "user1")
-         _ (println "🚀 - here about to do things")
+   (let [token (e/login (u/conn-context) "user1")
          acl1 (u/ingest-acl token (assoc (u/system-acl "SYSTEM_AUDIT_REPORT")
                                          :group_permissions
                                          [{:user_type "guest" :permissions ["read"]}]))
@@ -349,8 +338,7 @@
          AG10000-acls [acl8]
          read-acls (into [fixtures/*fixture-system-acl* fixtures/*fixture-provider-acl* acl1 acl2 acl3 acl4 acl8] provider-group-acls)
          create-acls (into [fixtures/*fixture-system-acl* fixtures/*fixture-provider-acl* acl3 acl5 acl7 acl8] provider-group-acls)
-         all-acls-no-admin [fixtures/*fixture-system-acl* fixtures/*fixture-provider-acl* acl1 acl2 acl3 acl4 acl5 acl6 acl7 acl8]
-         _ (println "🚀 - last thing in let")]
+         all-acls-no-admin [fixtures/*fixture-system-acl* fixtures/*fixture-provider-acl* acl1 acl2 acl3 acl4 acl5 acl6 acl7 acl8]]
 
      ;; AI note: passes
      (testing "Search ACLs by permitted group"
@@ -384,7 +372,7 @@
          ["GUEST"] {"options[permitted_group][ignore_case]" false} []))
 
      ;; AI note: not passing
-     (comment testing "Search ACLs by group permission"
+     (testing "Search ACLs by group permission"
               (are3 [group-permissions acls]
                     (let [query-map (generate-query-map-for-group-permissions group-permissions)
                           response (ac/search-for-acls (u/conn-context) query-map {:token token})]
@@ -430,7 +418,7 @@
 
      ;; AI note: failing
      ;; CMR-3154 acceptance criterium 3
-     (comment testing "Search ACLs by group permission just group or permission"
+     (testing "Search ACLs by group permission just group or permission"
               (are3 [msg query-map acls]
                     (let [response (ac/search-for-acls (u/conn-context)
                                                        {:group-permission {:0 query-map} :page_size 20}
@@ -464,22 +452,22 @@
 
      ;; AI note: failing
      ;; CMR-3154 acceptance criterium 5
-     (comment testing "Search ACLS by group permission with subfield other than permitted_group or permission is an error"
+     (testing "Search ACLS by group permission with subfield other than permitted_group or permission is an error"
               (let [query {:group-permission {:0 {:allowed-group "guest" :permission "read"}}}]
                 (is (= {:status 400
                         :body {:errors ["Parameter group_permission has invalid subfield [allowed_group]. Only 'permitted_group' and 'permission' are allowed."]}
                         :content-type :json}
                        (ac/search-for-acls (u/conn-context) query {:token token :raw? true})))))
 
      ;; AI note: failing
-     (comment testing "Searching ACLS by group permission with permission values other than read, create, update, delete, or order is an error"
+     (testing "Searching ACLS by group permission with permission values other than read, create, update, delete, or order is an error"
               (let [query {:group-permission {:0 {:permitted_group "guest" :permission "foo"}}}]
                 (is (= {:status 400
                         :body {:errors ["Sub-parameter permission of parameter group_permissions has invalid values [foo]. Only 'read', 'update', 'create', 'delete', or 'order' may be specified."]}
                         :content-type :json}
                        (ac/search-for-acls (u/conn-context) query {:token token :raw? true}))))))))
 
-(deftest ^:disruptive ^:serial 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
@@ -528,7 +516,7 @@
         "Identity type searches are always case-insensitive"
         ["PrOvIdEr"] (concat [fixtures/*fixture-provider-acl*] provider-group-acls)))))
 
-(deftest ^:disruptive ^:serial 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
@@ -552,7 +540,7 @@
       "Provider target, case insensitive"
       ["catalog_item_acl"] [fixtures/*fixture-provider-acl*])))
 
-(deftest ^:disruptive ^:serial 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"])
@@ -616,7 +604,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 ^:disruptive ^:serial 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"])
@@ -698,7 +686,7 @@
        "Multiple providers with empty results using ignore_case=false option"
        ["prov1"] {"options[provider][ignore_case]" false} []))))
 
-(deftest ^:disruptive ^:serial 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"])
@@ -766,7 +754,7 @@
          :permitted-user "user2"}
         [acl3 fixtures/*fixture-provider-acl* acl5 acl7]))))
 
-(deftest ^:disruptive ^:serial 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
@@ -827,7 +815,7 @@
         (is (= (u/acls->search-response (count expected-acls) expected-acls {:include-full-acl true})
                (dissoc response :took)))))))
 
-(deftest ^:disruptive ^:serial 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")
@@ -873,7 +861,7 @@
                             (count expected-acls-after-reindexing) expected-acls-after-reindexing)))
               (set (:items actual-response))))))))
 
-(deftest ^:disruptive ^:serial 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"}

system-int-test/test/cmr/system_int_test/access_control/enable_disable_test.clj

@@ -45,7 +45,7 @@
   (e/login (u/conn-context) username))
 
 
-(deftest ^:disruptive ^:serial enable-disable-re-enable-write-acl
+(deftest ^:serial enable-disable-re-enable-write-acl
   (let [token (get-token "admin")
         first-resp (ac/create-acl (u/conn-context) system-acl {:raw? true :token token})
         concept-id (get-in first-resp [:body :concept_id])
@@ -63,7 +63,7 @@
 
     ;; disable writes for access control service
     (u/disable-access-control-writes post-options)
-    (Thread/sleep 1000)
+    (Thread/sleep 500)
 
     (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 1000))))
+          (Thread/sleep 500))))
 
     (testing "save, upate, and delete acl works after re-enable"
       (let [resp (ac/create-acl (u/conn-context) system-acl {:raw? true :token token})]
@@ -88,7 +88,7 @@
         ;; test delete
         (is (= 200 (:status (ac/delete-acl (u/conn-context) concept-id2 {:token token :raw? true}))))))))
 
-(deftest ^:disruptive ^:serial enable-disable-re-enable-write-group
+(deftest ^:serial enable-disable-re-enable-write-group
   (let [token (get-token "admin")
         group (u/make-group)
         {:keys [status concept_id]} (u/create-group token group)
@@ -106,7 +106,7 @@
 
     ;; disable writes for access control service and give threads time to catch up
     (u/disable-access-control-writes post-options)
-    (Thread/sleep 5000)
+    (Thread/sleep 500)
 
     (testing "save, update, and delete group fails after disable"
       (try
@@ -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 1000))))
+          (Thread/sleep 500))))
 
     (testing "save, update, and delete group succeeds after re-enable"
       (let [group3 (u/make-group {:name "group4" :members ["user1" "user5"]})