Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-proctoring
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
edx-proctoring
Commits
b353ec2b
Commit
b353ec2b
authored
Sep 17, 2015
by
chrisndodge
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #158 from edx/release-rebase
Release rebase
parents
0de4b3e9
4e689215
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
edx_proctoring/backends/software_secure.py
+1
-1
edx_proctoring/backends/tests/test_software_secure.py
+2
-2
edx_proctoring/tests/test_api.py
+0
-1
No files found.
edx_proctoring/backends/software_secure.py
View file @
b353ec2b
...
@@ -232,7 +232,7 @@ class SoftwareSecureBackendProvider(ProctoringBackendProvider):
...
@@ -232,7 +232,7 @@ class SoftwareSecureBackendProvider(ProctoringBackendProvider):
# only 'Clean' and 'Rules Violation' could as passing
# only 'Clean' and 'Rules Violation' could as passing
status
=
(
status
=
(
ProctoredExamStudentAttemptStatus
.
verified
ProctoredExamStudentAttemptStatus
.
verified
if
review_status
in
[
'Clean'
,
'
Suspicious
'
]
if
review_status
in
[
'Clean'
,
'
Rules Violation
'
]
else
ProctoredExamStudentAttemptStatus
.
rejected
else
ProctoredExamStudentAttemptStatus
.
rejected
)
)
...
...
edx_proctoring/backends/tests/test_software_secure.py
View file @
b353ec2b
...
@@ -245,8 +245,8 @@ class SoftwareSecureTests(TestCase):
...
@@ -245,8 +245,8 @@ class SoftwareSecureTests(TestCase):
@ddt.data
(
@ddt.data
(
(
'Clean'
,
'satisfied'
),
(
'Clean'
,
'satisfied'
),
(
'
Suspicious
'
,
'satisfied'
),
(
'
Rules Violation
'
,
'satisfied'
),
(
'
Rules Violation
'
,
'failed'
),
(
'
Suspicious
'
,
'failed'
),
(
'Not Reviewed'
,
'failed'
),
(
'Not Reviewed'
,
'failed'
),
)
)
@ddt.unpack
@ddt.unpack
...
...
edx_proctoring/tests/test_api.py
View file @
b353ec2b
...
@@ -97,7 +97,6 @@ class ProctoredExamApiTests(LoggedInTestCase):
...
@@ -97,7 +97,6 @@ class ProctoredExamApiTests(LoggedInTestCase):
# Messages for get_student_view
# Messages for get_student_view
self
.
start_an_exam_msg
=
'This exam is proctored'
self
.
start_an_exam_msg
=
'This exam is proctored'
self
.
timed_exam_msg
=
'{exam_name} is a Timed Exam'
self
.
timed_exam_msg
=
'{exam_name} is a Timed Exam'
self
.
exam_time_expired_msg
=
'You did not complete the exam in the allotted time'
self
.
exam_time_expired_msg
=
'You did not complete the exam in the allotted time'
self
.
exam_time_error_msg
=
'There was a problem with your proctoring session'
self
.
exam_time_error_msg
=
'There was a problem with your proctoring session'
self
.
chose_proctored_exam_msg
=
'Follow these steps to set up and start your proctored exam'
self
.
chose_proctored_exam_msg
=
'Follow these steps to set up and start your proctored exam'
...
...
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