caddy-frontend: Adapt to SLAPOS_SR_TEST

software/caddy-frontend/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/erp5/test/utils.py

@@ -197,8 +197,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/kvm/test/test.py

@@ -40,7 +40,7 @@ import psutil
 import utils
 
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if os.environ.get('SLAPOS_TEST_DEBUG'):
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest

software/kvm/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/monitor/test/test.py

@@ -40,7 +40,7 @@ import psutil
 import utils
 
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if os.environ.get('SLAPOS_TEST_DEBUG'):
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest

software/monitor/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/plantuml/test/test.py

@@ -38,7 +38,7 @@ import plantuml
 import utils
 
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if os.environ.get('SLAPOS_TEST_DEBUG'):
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest

software/plantuml/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/powerdns/test/test.py

@@ -40,7 +40,7 @@ import psutil
 import utils
 
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if os.environ.get('SLAPOS_TEST_DEBUG'):
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest

software/powerdns/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/proftpd/test/test.py

@@ -41,7 +41,7 @@ import utils
 
 
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if os.environ.get('SLAPOS_TEST_DEBUG'):
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest

software/proftpd/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/re6stnet/test/test.py

@@ -39,12 +39,12 @@ import psutil
 
 import utils
 
-LOCAL_IPV4 = os.environ['LOCAL_IPV4']
-GLOBAL_IPV6 = os.environ['GLOBAL_IPV6']
+SLAPOS_TEST_IPV4 = os.environ['SLAPOS_TEST_IPV4']
+SLAPOS_TEST_IPV6 = os.environ['SLAPOS_TEST_IPV6']
 
 
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if os.environ.get('SLAPOS_TEST_DEBUG'):
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest

software/re6stnet/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/seleniumserver/test/test.py

@@ -46,7 +46,7 @@ from selenium.webdriver.support.ui import WebDriverWait
 
 from utils import SlapOSInstanceTestCase, findFreeTCPPort
 
-debug_mode = os.environ.get('DEBUG')
+debug_mode = os.environ.get('SLAPOS_TEST_DEBUG')
 # for development: debugging logs and install Ctrl+C handler
 if debug_mode:
   import logging
@@ -103,7 +103,7 @@ class WebServerMixin(object):
         ''' % (form['q'].value, file_data))
 
     super(WebServerMixin, self).setUp()
-    ip = os.environ.get('LOCAL_IPV4', '127.0.1.1')
+    ip = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
     port = findFreeTCPPort(ip)
     server = HTTPServer((ip, port), TestHandler)
     self.server_process = multiprocessing.Process(target=server.serve_forever)

software/seleniumserver/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address

software/slaprunner/test/test.py

@@ -40,7 +40,7 @@ import psutil
 import utils
 
 # for development: debugging logs and install Ctrl+C handler
-if os.environ.get('DEBUG'):
+if os.environ.get('SLAPOS_TEST_DEBUG'):
   import logging
   logging.basicConfig(level=logging.DEBUG)
   import unittest

software/slaprunner/test/utils.py

@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
       'slapos_binary': 'slapos',
     }
     # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('LOCAL_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['GLOBAL_IPV6']
+    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
+    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
 
     cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
     cls.config['ipv6_address'] = ipv6_address