merge with 3.21.3
The change in unittest_serverctl.py is needed because of daef7ce08fea
(from 3.20.11) and 3914388b2d0f (from the 3.22 branch). Due to both
changes, CubicWebTC.config.repository no longer creates a new repository
(and thus, a new connection). Since both DBDumpCommand and
CubicWebTC.tearDown try to shutdown the repo, tearDown breaks apart.
The solution is to temporarily disable ServerConfiguration's config
cache. By forcing DBDumpCommand to get a new configuration object, it
then gets its own Repo object, allowing tearDown and DBDumpCommand to
work independently.
from __future__ import absolute_import
import webtest
from cubicweb.wsgi import handler
from cubicweb.devtools.testlib import CubicWebTC
class CubicWebTestTC(CubicWebTC):
@classmethod
def init_config(cls, config):
super(CubicWebTestTC, cls).init_config(config)
config.global_set_option('base-url', 'http://localhost.local/')
def setUp(self):
super(CubicWebTestTC, self).setUp()
webapp = handler.CubicWebWSGIApplication(self.config)
self.webapp = webtest.TestApp(webapp)
def tearDown(self):
del self.webapp
super(CubicWebTestTC, self).tearDown()
def login(self, user=None, password=None, **args):
if user is None:
user = self.admlogin
if password is None:
password = self.admpassword if user == self.admlogin else user
args.update({
'__login': user,
'__password': password
})
return self.webapp.get('/login', args)
def logout(self):
return self.webapp.get('/logout')