Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
django-cas-server
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Samir
django-cas-server
Commits
3063cf11
Commit
3063cf11
authored
Jul 29, 2016
by
Valentin Samir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
few flake8 and python3 problems corrected
parent
b6cffcf4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
11 deletions
+14
-11
cas_server/models.py
cas_server/models.py
+0
-1
cas_server/tests/test_models.py
cas_server/tests/test_models.py
+2
-1
cas_server/tests/test_view.py
cas_server/tests/test_view.py
+2
-2
cas_server/tests/utils.py
cas_server/tests/utils.py
+7
-4
cas_server/utils.py
cas_server/utils.py
+3
-3
No files found.
cas_server/models.py
View file @
3063cf11
...
...
@@ -18,7 +18,6 @@ from django.contrib import messages
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils
import
timezone
from
django.utils.encoding
import
python_2_unicode_compatible
from
django.core.exceptions
import
ValidationError
from
django.core.mail
import
send_mail
import
re
...
...
cas_server/tests/test_models.py
View file @
3063cf11
...
...
@@ -81,6 +81,7 @@ class FederatedUserTestCase(TestCase, UserModels, FederatedIendityProviderModel)
self
.
assertIsNone
(
user
.
_attributs
)
self
.
assertIsNone
(
user
.
attributs
)
class
FederateSLOTestCase
(
TestCase
,
UserModels
):
"""test for the federated SLO model"""
def
test_clean_deleted_sessions
(
self
):
...
...
@@ -275,7 +276,7 @@ class TicketTestCase(TestCase, UserModels, BaseServicePattern):
self
.
assertIsNone
(
ticket
.
attributs
)
@
mock
.
patch
(
"cas_server.utils.last_version"
,
lambda
:
"1.2.3"
)
@
mock
.
patch
(
"cas_server.utils.last_version"
,
lambda
:
"1.2.3"
)
@
override_settings
(
ADMINS
=
[(
"Ano Nymous"
,
"ano.nymous@example.net"
)])
@
override_settings
(
CAS_NEW_VERSION_EMAIL_WARNING
=
True
)
class
NewVersionWarningTestCase
(
TestCase
):
...
...
cas_server/tests/test_view.py
View file @
3063cf11
...
...
@@ -49,7 +49,7 @@ class LoginTestCase(TestCase, BaseServicePattern, CanLogin):
self
.
setup_service_patterns
()
@
override_settings
(
CAS_NEW_VERSION_HTML_WARNING
=
True
)
@
mock
.
patch
(
"cas_server.utils.last_version"
,
lambda
:
"1.2.3"
)
@
mock
.
patch
(
"cas_server.utils.last_version"
,
lambda
:
"1.2.3"
)
@
mock
.
patch
(
"cas_server.utils.VERSION"
,
"0.1.2"
)
def
test_new_version_available_ok
(
self
):
client
=
Client
()
...
...
@@ -57,7 +57,7 @@ class LoginTestCase(TestCase, BaseServicePattern, CanLogin):
self
.
assertIn
(
b
"A new version of the application is available"
,
response
.
content
)
@
override_settings
(
CAS_NEW_VERSION_HTML_WARNING
=
True
)
@
mock
.
patch
(
"cas_server.utils.last_version"
,
lambda
:
None
)
@
mock
.
patch
(
"cas_server.utils.last_version"
,
lambda
:
None
)
@
mock
.
patch
(
"cas_server.utils.VERSION"
,
"0.1.2"
)
def
test_new_version_available_badpypi
(
self
):
client
=
Client
()
...
...
cas_server/tests/utils.py
View file @
3063cf11
...
...
@@ -16,10 +16,6 @@ import django
from
django.test
import
Client
from
django.template
import
loader
from
django.utils
import
timezone
if
django
.
VERSION
<
(
1
,
8
):
from
django.template
import
Context
else
:
Context
=
lambda
x
:
x
import
cgi
import
six
...
...
@@ -33,6 +29,13 @@ from cas_server import models
from
cas_server
import
utils
if
django
.
VERSION
<
(
1
,
8
):
from
django.template
import
Context
else
:
def
Context
(
arg
):
return
arg
def
return_unicode
(
string
,
charset
):
"""make `string` a unicode if `string` is a unicode or bytes encoded with `charset`"""
if
not
isinstance
(
string
,
six
.
text_type
):
...
...
cas_server/utils.py
View file @
3063cf11
...
...
@@ -654,8 +654,8 @@ def last_version():
else
:
try
:
req
=
requests
.
get
(
settings
.
CAS_NEW_VERSION_JSON_URL
)
data
=
json
.
loads
(
req
.
conten
t
)
versions
=
data
[
"releases"
].
keys
(
)
data
=
json
.
loads
(
req
.
tex
t
)
versions
=
list
(
data
[
"releases"
].
keys
()
)
versions
.
sort
()
version
=
versions
[
-
1
]
last_version
.
_cache
=
(
time
.
time
(),
version
,
True
)
...
...
@@ -664,7 +664,7 @@ def last_version():
KeyError
,
ValueError
,
requests
.
exceptions
.
RequestException
)
as
error
:
# pragma: no cover (should not happen unless pypi is not available)
)
as
error
:
# pragma: no cover (should not happen unless pypi is not available)
logger
.
error
(
"Unable to fetch %s: %s"
%
(
settings
.
CAS_NEW_VERSION_JSON_URL
,
error
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment