Merge pull request #786 from uw-it-aca/develop

Develop

Author: mikeseibel

endorsement/services/zoom_basic.py

@@ -47,14 +47,6 @@ def service_link(self):
         return ("https://itconnect.uw.edu/connect/phones"
                 "/conferencing/zoom-video-conferencing/")
 
-    def valid_legacy_shared_netid(self, resource, endorser):
-        try:
-            endorsee = Endorsee.objects.get(netid=resource.name)
-            self.get_endorsement(endorser, endorsee)
-            return True
-        except (Endorsee.DoesNotExist, NoEndorsementException):
-            return False
-
     def is_permitted(self, endorser, endorsee):
         try:
             self.get_endorsement(endorser, endorsee)

endorsement/test/services/test_zoom_basic.py

@@ -46,9 +46,9 @@ def test_shared(self):
         self.assertTrue(data['endorser']['netid'] == 'jstaff')
 
         endorsible, endorsed = self.get_shared(data)
-        self.assertEquals(len(endorsible), 1)
-        self.assertEquals(len(endorsed), 1)
-        self.assertTrue('cpnebeng' in endorsible)
+        self.assertEquals(len(endorsible), 0)
+        self.assertEquals(len(endorsed), 0)
+        self.assertFalse('cpnebeng' in endorsible)
         self.assertFalse('wadm_jstaff' in endorsed)
 
     def test_endorse_netid(self):