Merge pull request #32 from astro-datalab/auth_tests

Adds 17 new tests for auth and fixes other tests
astro-datalab · Mar 13, 2024 · a04c041 · a04c041
2 parents faab3de + 96583fe
commit a04c041
Show file tree

Hide file tree

Showing 2 changed files with 434 additions and 28 deletions.
diff --git a/tests/expected_pat.py b/tests/expected_pat.py
@@ -110,6 +110,20 @@
 #    },
 #]
 
+# OLD as of March 13, 2024
+#find_3 = [{'_dr': 'DESI-EDR',
+#           'dec': 5.662937176455572,
+#           'ra': 208.7076645721256,
+#           'sparcl_id': '00063e73-992e-11ee-ad57-525400aad0aa'},
+#          {'_dr': 'DESI-EDR',
+#           'dec': 5.492057016906403,
+#           'ra': 209.52823969727436,
+#           'sparcl_id': '000d4892-9931-11ee-9e4d-525400aad0aa'},
+#          {'_dr': 'SDSS-DR17',
+#           'dec': 34.863511,
+#           'ra': 194.86904,
+#           'sparcl_id': '000e388f-992d-11ee-a373-525400aad0aa'}]
+
 find_3 = [{'_dr': 'DESI-EDR',
            'dec': 5.662937176455572,
            'ra': 208.7076645721256,
@@ -118,10 +132,10 @@
            'dec': 5.492057016906403,
            'ra': 209.52823969727436,
            'sparcl_id': '000d4892-9931-11ee-9e4d-525400aad0aa'},
-          {'_dr': 'SDSS-DR17',
-           'dec': 34.863511,
-           'ra': 194.86904,
-           'sparcl_id': '000e388f-992d-11ee-a373-525400aad0aa'}]
+          {'_dr': 'BOSS-DR16',
+           'dec': 27.461703,
+           'ra': 141.95067,
+           'sparcl_id': '001b11a6-992f-11ee-993c-525400aad0aa'}]
 
 # OLD as of Dec 14, 2023
 #find_4 = [
@@ -130,9 +144,14 @@
 #    "0018f253-75d7-11ee-8253-525400aad0aa",
 #]
 
+# OLD as of March 13, 2024
+#find_4 = ['00063e73-992e-11ee-ad57-525400aad0aa',
+#          '000d4892-9931-11ee-9e4d-525400aad0aa',
+#          '000e388f-992d-11ee-a373-525400aad0aa']
+
 find_4 = ['00063e73-992e-11ee-ad57-525400aad0aa',
           '000d4892-9931-11ee-9e4d-525400aad0aa',
-          '000e388f-992d-11ee-a373-525400aad0aa']
+          '001b11a6-992f-11ee-993c-525400aad0aa']
 
 find_5a = [
     {"_dr": "BOSS-DR16", "data_release": "BOSS-DR16", "mjd": 55689},
@@ -148,14 +167,22 @@
 #    "fbb22144-25c5-4330-9b0b-8b2eac83079c",
 #]
 
+# OLD as of March 13, 2024
+#reorder_1a = ['00063e73-992e-11ee-ad57-525400aad0aa',
+#              '000d4892-9931-11ee-9e4d-525400aad0aa',
+#              '000e388f-992d-11ee-a373-525400aad0aa']
+
 reorder_1a = ['00063e73-992e-11ee-ad57-525400aad0aa',
               '000d4892-9931-11ee-9e4d-525400aad0aa',
-              '000e388f-992d-11ee-a373-525400aad0aa']
+              '001b11a6-992f-11ee-993c-525400aad0aa']
 
 # OLD as of Dec 14, 2023
 #reorder_1b = [1254334738051655680, 1254335012929562624, 1254335287807469568]
 
-reorder_1b = [39627926995470031, 39627920993422590, 2258670445286942720]
+# OLD as of March 13, 2024
+#reorder_1b = [39627926995470031, 39627920993422590, 2258670445286942720]
+
+reorder_1b = [39627926995470031, 39627920993422590, -5672180510041550848]
 
 # OLD as of Dec 14, 2023
 #reorder_2a = [1254334738051655680, 1254335012929562624, None]
@@ -168,3 +195,58 @@
 #reorder_2b = [1254334738051655680, 1254335012929562624, None]
 
 reorder_2b = [39627926995470031, 39627920993422590, None]
+
+authorized_1 = {'Loggedin_As': '[email protected]',
+                'Authorized_Datasets': {'BOSS-DR16',
+                                        'DESI-EDR',
+                                        'SDSS-DR16',
+                                        'SDSS-DR17-test'}}
+
+authorized_2 = {'Loggedin_As': '[email protected]',
+                'Authorized_Datasets': {'BOSS-DR16', 'DESI-EDR', 'SDSS-DR16'}}
+
+authorized_3 = {'Loggedin_As': 'Anonymous',
+                'Authorized_Datasets': {'BOSS-DR16', 'DESI-EDR', 'SDSS-DR16'}}
+
+auth_find_1 = ['84452fad-dbe7-11ee-a970-525400aad0aa',
+               '847e0be4-dbe7-11ee-b095-525400aad0aa']
+
+auth_find_2 = ['00769ec9-9931-11ee-97de-525400aad0aa',
+               '00b0904d-992f-11ee-b7f9-525400aad0aa',
+               '00c6d798-9931-11ee-af11-525400aad0aa']
+
+auth_find_4 = ['00769ec9-9931-11ee-97de-525400aad0aa',
+               '00b0904d-992f-11ee-b7f9-525400aad0aa',
+               '00c6d798-9931-11ee-af11-525400aad0aa',
+               '010eb4d0-992f-11ee-89de-525400aad0aa',
+               '014ac8ea-9931-11ee-b693-525400aad0aa',
+               '01c9187a-9931-11ee-bbbc-525400aad0aa',
+               '01db0ea0-9930-11ee-a576-525400aad0aa',
+               '020ed77c-992f-11ee-aefb-525400aad0aa',
+               '022ab30b-9931-11ee-a372-525400aad0aa',
+               '024c9ba1-9930-11ee-aa56-525400aad0aa']
+
+auth_find_6 = ['00769ec9-9931-11ee-97de-525400aad0aa',
+               '00b0904d-992f-11ee-b7f9-525400aad0aa',
+               '00c6d798-9931-11ee-af11-525400aad0aa',
+               '010eb4d0-992f-11ee-89de-525400aad0aa',
+               '014ac8ea-9931-11ee-b693-525400aad0aa',
+               '01c9187a-9931-11ee-bbbc-525400aad0aa',
+               '01db0ea0-9930-11ee-a576-525400aad0aa',
+               '020ed77c-992f-11ee-aefb-525400aad0aa',
+               '022ab30b-9931-11ee-a372-525400aad0aa',
+               '024c9ba1-9930-11ee-aa56-525400aad0aa']
+
+auth_retrieve_1 = ('SDSS-DR16, 3848 ; SDSS-DR16, 3848 ; '
+                   'SDSS-DR17-test, 3859 ; SDSS-DR17-test, 3859 ; ')
+
+auth_retrieve_2 = ('DESI-EDR, 7781 ; BOSS-DR16, 4615 ; '
+                   'BOSS-DR16, 4615 ; SDSS-DR16, 3848 ; '
+                   'SDSS-DR16, 3848 ; DESI-EDR, 7781 ; '
+                   'SDSS-DR17-test, 3859 ; SDSS-DR17-test, 3859 ; ')
+
+auth_retrieve_5 = ('DESI-EDR, 7781 ; SDSS-DR16, 3848 ; '
+                   'SDSS-DR16, 3848 ; DESI-EDR, 7781 ; ')
+
+auth_retrieve_8 = ('BOSS-DR16, 4615 ; BOSS-DR16, 4615 ; '
+                   'SDSS-DR16, 3848 ; SDSS-DR16, 3848 ; ')