Changeset 10515

Timestamp:

21 Aug 2013, 10:56:55 (11 years ago)

Author:

Henrik Bettermann

Message:

Rename get_moodle_data.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

• authenticators.py (modified) (2 diffs)
• tests/test_authenticators.py (modified) (3 diffs)

main/waeup.cas/trunk/waeup/cas/authenticators.py

@@ -206 +206 @@
             if principal is not None:
                 if principal['type'] == 'student':
-                    student = proxy.get_moodle_data(username)
+                    student = proxy.get_student_moodle_data(username)
                     try:
                         # Usernames in Moodle must not contain uppercase
@@ -220 +220 @@
                         if not 'Username already exists' in faultstring:
                             return (False, faultstring)
-                        # user exists
-                        pass
                     try:
                         result = moodle.core_user_get_users([

main/waeup.cas/trunk/waeup/cas/tests/test_authenticators.py

@@ -167 +167 @@
             self._check_credentials, 'check_student_credentials')
         self.register_function(
-            self._get_moodle_data, 'get_moodle_data')
+            self._get_student_moodle_data, 'get_student_moodle_data')
 
     def _check_credentials(self, username, password):
@@ -188 +188 @@
         return None
 
-    def _get_moodle_data(self, username):
-        # fake waeup.kofa get_moodle_data method.
+    def _get_student_moodle_data(self, username):
+        # fake waeup.kofa get_student_moodle_data method.
         if username == 'bird':
             return dict(email='aa@aa.aa',
@@ -289 +289 @@
             'id': 'pig',
             'type': 'applicant'}
-        result = proxy.get_moodle_data('pig')
+        result = proxy.get_student_moodle_data('pig')
         assert result == {
             'lastname': 'Charles',