slapos-sr-test: Pick erp5.util 0.4.58

Improved supervisord management is critical for maintenance of instances
between tests.

software/caddy-frontend/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/erp5/test/utils.py

@@ -195,6 +195,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': getattr(cls, '__partition_reference__', cls.__name__),
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/helloworld/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/kvm/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/monitor/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/plantuml/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/powerdns/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/proftpd/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/re6stnet/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/seleniumserver/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')

software/slapos-sr-testing/software.cfg

@@ -76,18 +76,11 @@ setup = ${slapos-repository:location}/software/slaprunner/test/
 egg = slapos.test.helloworld
 setup = ${slapos-repository:location}/software/helloworld/test/
 
-[erp5.util-setup]
-<= setup-develop-egg
-egg = erp5.util[testnode]
-setup = ${erp5.util-repository:location}
-
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
   ${pillow-python:egg}
   ${python-pynacl:egg}
-  ${erp5.util-setup:egg}
   ${python-cryptography:egg}
   ${bcrypt:egg}
   slapos.core
@@ -120,13 +113,6 @@ forbid-download-cache = true
 repository = https://lab.nexedi.com/nexedi/slapos.git
 branch = master
 
-# XXX we need an unreleased version of erp5.util for better test uniqe naming
-# later we can stop fetching it from git and just use egg
-[erp5.util-repository]
-<= git-clone-repository
-repository = https://lab.nexedi.com/nexedi/erp5.git
-revision = aa516c7eb88308127949675bcc77d651630ebf5e
-
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
@@ -134,12 +120,12 @@ output = ${buildout:directory}/template.cfg
 mode = 640
 
 [versions]
+# Recent erp5.util is needed
+erp5.util = 0.4.58
+
 # Use slapos.core <= 1.4.16 for correctly working slapos proxy
 slapos.core = 1.4.15
 
-# clear the version of tested eggs, to make sure we installed the developped ones
-erp5.util =
-
 # Various needed versions
 Pillow = 5.3.0
 PyNaCl = 1.3.0

software/slaprunner/test/utils.py

@@ -185,6 +185,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'partition_reference': cls.__name__,
       # "proper" slapos command must be in $PATH
       'slapos_binary': 'slapos',
+      'node_quantity': '3',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
     ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')