Commit e35a7b9b authored by Jérome Perrin's avatar Jérome Perrin

slapos-testing: install slapos and supervisor scripts

and make sure we really use the develop version, by clearing version pin
that might be for another version.

Also clean up comments in version section.

This will be needed for standalone tests.
parent 008379cf
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = c7becd2a66b3305406f965b969907d52 md5sum = b48db2861644d9e9c30d2652c100d70e
...@@ -84,7 +84,7 @@ command-line = ...@@ -84,7 +84,7 @@ command-line =
# guarantee about free ports on IPV4 and IPV6 # guarantee about free ports on IPV4 and IPV6
# * LOCAL_IPV4 is backward compatible, to be migrated, SLAPOS_TEST_IPV4 # * LOCAL_IPV4 is backward compatible, to be migrated, SLAPOS_TEST_IPV4
environment = environment =
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:/usr/bin/:/bin/ PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random} LOCAL_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random} SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random} SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
......
...@@ -114,10 +114,13 @@ eggs = ...@@ -114,10 +114,13 @@ eggs =
zope.testing zope.testing
httmock httmock
pyflakes pyflakes
supervisor
entry-points = entry-points =
runTestSuite=erp5.util.testsuite:runTestSuite runTestSuite=erp5.util.testsuite:runTestSuite
scripts = scripts =
runTestSuite runTestSuite
slapos
supervisord
interpreter= interpreter=
python_for_test python_for_test
...@@ -182,11 +185,14 @@ output = ${buildout:directory}/template.cfg ...@@ -182,11 +185,14 @@ output = ${buildout:directory}/template.cfg
mode = 640 mode = 640
[versions] [versions]
Pygments = 2.1.3 # clear version pins of tested eggs for which we want to generate scripts
# otherwise, the scripts will be generated for the pinned version.
slapos.recipe.template = 4.3 slapos.core =
erp5.util =
# All depencies should be pinned. # All depencies should be pinned.
Pygments = 2.1.3
slapos.recipe.template = 4.3
zc.lockfile = 1.4 zc.lockfile = 1.4
bcrypt = 3.1.4 bcrypt = 3.1.4
dnspython = 1.15.0 dnspython = 1.15.0
......
  • this seem to cause error in setup of erp5.util

    
    Traceback (most recent call last):
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/bin/python_for_test", line 110, in <module>
        exec(compile(__file__f.read(), __file__, "exec"))
      File "setup.py", line 85, in <module>
        'psutil >= 0.5.0',
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/eggs/setuptools-40.4.3-py2.7.egg/setuptools/__init__.py", line 140, in setup
        return distutils.core.setup(**attrs)
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/distutils/core.py", line 151, in setup
        dist.run_commands()
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/distutils/dist.py", line 953, in run_commands
        self.run_command(cmd)
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/distutils/dist.py", line 972, in run_command
        cmd_obj.run()
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/eggs/setuptools-40.4.3-py2.7.egg/setuptools/command/test.py", line 228, in run
        self.run_tests()
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/eggs/setuptools-40.4.3-py2.7.egg/setuptools/command/test.py", line 250, in run_tests
        exit=False,
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/unittest/main.py", line 94, in __init__
        self.parseArgs(argv)
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/unittest/main.py", line 149, in parseArgs
        self.createTests()
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/unittest/main.py", line 158, in createTests
        self.module)
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/unittest/loader.py", line 130, in loadTestsFromNames
        suites = [self.loadTestsFromName(name, module) for name in names]
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/unittest/loader.py", line 103, in loadTestsFromName
        return self.loadTestsFromModule(obj)
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/eggs/setuptools-40.4.3-py2.7.egg/setuptools/command/test.py", line 54, in loadTestsFromModule
        tests.append(self.loadTestsFromName(submodule))
      File "/srv/slapgrid/slappart3/srv/testnode/bvi/soft/0458d6b0035b6e095f9dd67c55797c42/parts/python2.7/lib/python2.7/unittest/loader.py", line 100, in loadTestsFromName
        parent, obj = obj, getattr(obj, part)
    AttributeError: 'module' object has no attribute 'testERP5TestNode'

    ( I'll take a look )

    edit: it was not releated

    Edited by Jérome Perrin
  • if I execute the test python and try to import the module there's a more interesting traceback:

    /srv/slapgrid/slappart19/srv/testnode/cqd/soft/dec99fa5745e5ff495122f17dcb4e64e/bin/python_for_test
    
    >>> import erp5.tests.testERP5TestNode
    Traceback (most recent call last):
      File "<console>", line 1, in <module>
      File "/srv/slapgrid/slappart19/srv/testnode/cqd/soft/dec99fa5745e5ff495122f17dcb4e64e/parts/erp5.util-repository/erp5/tests/testERP5TestNode.py", line 6, in <module>
        from erp5.util.testnode.testnode import TestNode, test_type_registry
      File "/srv/slapgrid/slappart19/srv/testnode/cqd/soft/dec99fa5745e5ff495122f17dcb4e64e/parts/erp5.util-repository/erp5/util/testnode/testnode.py", line 38, in <module>
        from .ScalabilityTestRunner import ScalabilityTestRunner
      File "/srv/slapgrid/slappart19/srv/testnode/cqd/soft/dec99fa5745e5ff495122f17dcb4e64e/parts/erp5.util-repository/erp5/util/testnode/ScalabilityTestRunner.py", line 33, in <module>
        from . import SlapOSControler, SlapOSMasterCommunicator
      File "/srv/slapgrid/slappart19/srv/testnode/cqd/soft/dec99fa5745e5ff495122f17dcb4e64e/parts/erp5.util-repository/erp5/util/testnode/SlapOSMasterCommunicator.py", line 14, in <module>
        from slapos.slap.util import xml2dict
    ImportError: No module named util
    >>> from slapos.util import xml2dict
  • erp5@2f25a327 should fix

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