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 3b9813d5 authored by marc's avatar marc

test server : update tests

-fix missing args
-fix fake log function to match the signature of the real log function
parent aead2df5
......@@ -26,7 +26,11 @@ 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,7 +34,11 @@ 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,7 +26,11 @@ 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,7 +24,11 @@ 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
......
......@@ -28,7 +28,11 @@ 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,7 +26,11 @@ 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,7 +23,11 @@ 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
......@@ -59,7 +63,12 @@ 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):
......@@ -78,7 +87,7 @@ class PatientController(unittest.TestCase):
request.vars["id_label"] = "bab"
resp = edit_form()
self.assertNotEqual(resp.find('bab bab (1): patient edited"'), -1, "edit patient failled")
self.assertNotEqual(resp.find('bab bab (1): patient edited"'), -1, "edit patient failed")
def testConfirm(self):
......@@ -93,7 +102,7 @@ class PatientController(unittest.TestCase):
request.vars["id"] = patient_id
resp = delete()
self.assertNotEqual(resp.find('patient ('+str(patient_id)+') deleted'), -1, "delete patient failled")
self.assertNotEqual(resp.find('patient ('+str(patient_id)+') deleted'), -1, "delete patient failed")
def test2Permission(self):
......
......@@ -23,7 +23,11 @@ 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
......@@ -63,7 +67,7 @@ class Results_fileController(unittest.TestCase):
request.vars["sample_set_id"] = fake_sample_set_id
resp = delete()
self.assertNotEqual(resp.find("process deleted"), -1, "delete result file failled")
self.assertNotEqual(resp.find("process deleted"), -1, "delete result file failed")
......
......@@ -23,7 +23,11 @@ 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,7 +23,11 @@ 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