diff --git a/software/jupyter/buildout.hash.cfg b/software/jupyter/buildout.hash.cfg index 0ea4b753d6795199637321167832a71c5308f4ff..c07d17e80a17ed52f45940a0c54d12da0874db0a 100644 --- a/software/jupyter/buildout.hash.cfg +++ b/software/jupyter/buildout.hash.cfg @@ -19,7 +19,7 @@ md5sum = de37ec3d4adb0be4c67bcc7397f27c91 [instance-jupyter] filename = instance-jupyter.cfg.in -md5sum = 38bbb350a07ad2bb9f01b46122231708 +md5sum = cbc90e517ae3680ab8bef04c6f503af5 [jupyter-notebook-config] filename = jupyter_notebook_config.py.jinja diff --git a/software/jupyter/instance-jupyter.cfg.in b/software/jupyter/instance-jupyter.cfg.in index 8c3b12b43962ba9c89fc10aa53524eb1926a18d9..ea1646c43aa8b7c7157a2505b5f8ad0f0d89c7ab 100644 --- a/software/jupyter/instance-jupyter.cfg.in +++ b/software/jupyter/instance-jupyter.cfg.in @@ -175,7 +175,7 @@ instance-configuration = raw jupyter-password ${jupyter-password:passwd} [publish-connection-parameter] -recipe = slapos.cookbook:publish.serialised +recipe = slapos.cookbook:publish jupyter-classic-url = ${request-slave-frontend:connection-secure_access}/tree url = ${:jupyter-classic-url} jupyterlab-url = ${request-slave-frontend:connection-secure_access}/lab diff --git a/software/jupyter/test/test.py b/software/jupyter/test/test.py index 3575aff0f9eacc2393c304f171e7a1402c9e4b54..947762b8c52bd955338c98c00112b5985701b051 100644 --- a/software/jupyter/test/test.py +++ b/software/jupyter/test/test.py @@ -43,12 +43,7 @@ setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass( class TestJupyter(InstanceTestCase): def test(self): - parameter_dict = self.computer_partition.getConnectionParameterDict() - self.assertTrue('_' in parameter_dict) - try: - connection_dict = json.loads(parameter_dict['_']) - except Exception as e: - self.fail("Can't parse json in %s, error %s" % (parameter_dict['_'], e)) + connection_dict = self.computer_partition.getConnectionParameterDict() self.assertTrue('password' in connection_dict) password = connection_dict['password'] @@ -92,15 +87,11 @@ class TestJupyterAdditional(InstanceTestCase): @classmethod def getInstanceParameterDict(cls): return { - 'frontend-additional-instance-guid': 'SOMETHING' } + 'frontend-additional-instance-guid': 'SOMETHING' + } def test(self): - parameter_dict = self.computer_partition.getConnectionParameterDict() - self.assertTrue('_' in parameter_dict) - try: - connection_dict = json.loads(parameter_dict['_']) - except Exception as e: - self.fail("Can't parse json in %s, error %s" % (parameter_dict['_'], e)) + connection_dict = self.computer_partition.getConnectionParameterDict() result = requests.get( connection_dict['url'], verify=False, allow_redirects=False) @@ -151,12 +142,7 @@ class TestJupyterAdditional(InstanceTestCase): class TestJupyterPassword(InstanceTestCase): def test(self): - parameter_dict = self.computer_partition.getConnectionParameterDict() - self.assertTrue('_' in parameter_dict) - try: - connection_dict = json.loads(parameter_dict['_']) - except Exception as e: - self.fail("Can't parse json in %s, error %s" % (parameter_dict['_'], e)) + connection_dict = self.computer_partition.getConnectionParameterDict() url = connection_dict['url'] with requests.Session() as s: