Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 8c98aa3d authored by marc's avatar marc

fix failed merge

parent a53b0b5f
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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):
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment