Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
8c98aa3d
Commit
8c98aa3d
authored
Oct 02, 2016
by
marc
Browse files
fix failed merge
parent
a53b0b5f
Changes
10
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/tests/controllers/admin.py
View file @
8c98aa3d
...
...
@@ -26,11 +26,7 @@ class AdminController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/config.py
View file @
8c98aa3d
...
...
@@ -34,11 +34,7 @@ class ConfigController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/default.py
View file @
8c98aa3d
...
...
@@ -26,11 +26,7 @@ class DefaultController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/file.py
View file @
8c98aa3d
...
...
@@ -24,12 +24,9 @@ class FileController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
log
.
debug
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/group.py
View file @
8c98aa3d
...
...
@@ -28,11 +28,7 @@ class GroupController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/notification.py
View file @
8c98aa3d
...
...
@@ -26,11 +26,7 @@ class NotificationController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/patient.py
View file @
8c98aa3d
...
...
@@ -23,11 +23,7 @@ class PatientController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
@@ -63,12 +59,8 @@ class PatientController(unittest.TestCase):
name
=
"%s %s"
%
(
request
.
vars
[
"first_name"
],
request
.
vars
[
"last_name"
])
resp
=
add_form
()
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
self
.
assertNotEqual
(
resp
.
find
(
'patient %s added'
%
name
),
-
1
,
"add patient failled"
)
=======
print
db
(
db
.
auth_permission
.
id
>
0
).
select
()
self
.
assertNotEqual
(
resp
.
find
(
'patient bob bob added'
),
-
1
,
"add patient failed"
)
>>>>>>>
test
server
:
update
tests
def
testEdit
(
self
):
...
...
server/web2py/applications/vidjil/tests/controllers/results_file.py
View file @
8c98aa3d
...
...
@@ -23,11 +23,7 @@ class Results_fileController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/sample_set.py
View file @
8c98aa3d
...
...
@@ -23,11 +23,7 @@ class Sample_setController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
server/web2py/applications/vidjil/tests/controllers/user.py
View file @
8c98aa3d
...
...
@@ -23,11 +23,7 @@ class UserController(unittest.TestCase):
# rewrite info / error functions
# for some reasons we lost them between the testRunner and the testCase but we need them to avoid error so ...
<<<<<<<
aead2df5e43aca11a66cf41ef861493f7e1d389d
def
f
(
a
,
**
kwargs
):
=======
def
f
(
a
,
extra
=
{}):
>>>>>>>
test
server
:
update
tests
pass
log
.
info
=
f
log
.
error
=
f
...
...
Write
Preview
Supports
Markdown
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