Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos
Commits
e26843de
Commit
e26843de
authored
Dec 14, 2018
by
Łukasz Nowak
Committed by
Łukasz Nowak
Dec 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Adapt to SLAPOS_SR_TEST
parent
ae7b83b8
Changes
19
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
113 additions
and
113 deletions
+113
-113
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+82
-82
software/caddy-frontend/test/utils.py
software/caddy-frontend/test/utils.py
+2
-2
software/erp5/test/utils.py
software/erp5/test/utils.py
+2
-2
software/kvm/test/test.py
software/kvm/test/test.py
+1
-1
software/kvm/test/utils.py
software/kvm/test/utils.py
+2
-2
software/monitor/test/test.py
software/monitor/test/test.py
+1
-1
software/monitor/test/utils.py
software/monitor/test/utils.py
+2
-2
software/plantuml/test/test.py
software/plantuml/test/test.py
+1
-1
software/plantuml/test/utils.py
software/plantuml/test/utils.py
+2
-2
software/powerdns/test/test.py
software/powerdns/test/test.py
+1
-1
software/powerdns/test/utils.py
software/powerdns/test/utils.py
+2
-2
software/proftpd/test/test.py
software/proftpd/test/test.py
+1
-1
software/proftpd/test/utils.py
software/proftpd/test/utils.py
+2
-2
software/re6stnet/test/test.py
software/re6stnet/test/test.py
+3
-3
software/re6stnet/test/utils.py
software/re6stnet/test/utils.py
+2
-2
software/seleniumserver/test/test.py
software/seleniumserver/test/test.py
+2
-2
software/seleniumserver/test/utils.py
software/seleniumserver/test/utils.py
+2
-2
software/slaprunner/test/test.py
software/slaprunner/test/test.py
+1
-1
software/slaprunner/test/utils.py
software/slaprunner/test/utils.py
+2
-2
No files found.
software/caddy-frontend/test/test.py
View file @
e26843de
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/erp5/test/utils.py
View file @
e26843de
...
@@ -197,8 +197,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -197,8 +197,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/kvm/test/test.py
View file @
e26843de
...
@@ -40,7 +40,7 @@ import psutil
...
@@ -40,7 +40,7 @@ import psutil
import
utils
import
utils
# for development: debugging logs and install Ctrl+C handler
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'DEBUG'
):
if
os
.
environ
.
get
(
'
SLAPOS_TEST_
DEBUG'
):
import
logging
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
import
unittest
...
...
software/kvm/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/monitor/test/test.py
View file @
e26843de
...
@@ -40,7 +40,7 @@ import psutil
...
@@ -40,7 +40,7 @@ import psutil
import
utils
import
utils
# for development: debugging logs and install Ctrl+C handler
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'DEBUG'
):
if
os
.
environ
.
get
(
'
SLAPOS_TEST_
DEBUG'
):
import
logging
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
import
unittest
...
...
software/monitor/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/plantuml/test/test.py
View file @
e26843de
...
@@ -38,7 +38,7 @@ import plantuml
...
@@ -38,7 +38,7 @@ import plantuml
import
utils
import
utils
# for development: debugging logs and install Ctrl+C handler
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'DEBUG'
):
if
os
.
environ
.
get
(
'
SLAPOS_TEST_
DEBUG'
):
import
logging
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
import
unittest
...
...
software/plantuml/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/powerdns/test/test.py
View file @
e26843de
...
@@ -40,7 +40,7 @@ import psutil
...
@@ -40,7 +40,7 @@ import psutil
import
utils
import
utils
# for development: debugging logs and install Ctrl+C handler
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'DEBUG'
):
if
os
.
environ
.
get
(
'
SLAPOS_TEST_
DEBUG'
):
import
logging
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
import
unittest
...
...
software/powerdns/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/proftpd/test/test.py
View file @
e26843de
...
@@ -41,7 +41,7 @@ import utils
...
@@ -41,7 +41,7 @@ import utils
# for development: debugging logs and install Ctrl+C handler
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'DEBUG'
):
if
os
.
environ
.
get
(
'
SLAPOS_TEST_
DEBUG'
):
import
logging
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
import
unittest
...
...
software/proftpd/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/re6stnet/test/test.py
View file @
e26843de
...
@@ -39,12 +39,12 @@ import psutil
...
@@ -39,12 +39,12 @@ import psutil
import
utils
import
utils
LOCAL_IPV4
=
os
.
environ
[
'LOCAL
_IPV4'
]
SLAPOS_TEST_IPV4
=
os
.
environ
[
'SLAPOS_TEST
_IPV4'
]
GLOBAL_IPV6
=
os
.
environ
[
'GLOBAL
_IPV6'
]
SLAPOS_TEST_IPV6
=
os
.
environ
[
'SLAPOS_TEST
_IPV6'
]
# for development: debugging logs and install Ctrl+C handler
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'DEBUG'
):
if
os
.
environ
.
get
(
'
SLAPOS_TEST_
DEBUG'
):
import
logging
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
import
unittest
...
...
software/re6stnet/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/seleniumserver/test/test.py
View file @
e26843de
...
@@ -46,7 +46,7 @@ from selenium.webdriver.support.ui import WebDriverWait
...
@@ -46,7 +46,7 @@ from selenium.webdriver.support.ui import WebDriverWait
from
utils
import
SlapOSInstanceTestCase
,
findFreeTCPPort
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
# for development: debugging logs and install Ctrl+C handler
if
debug_mode
:
if
debug_mode
:
import
logging
import
logging
...
@@ -103,7 +103,7 @@ class WebServerMixin(object):
...
@@ -103,7 +103,7 @@ class WebServerMixin(object):
'''
%
(
form
[
'q'
].
value
,
file_data
))
'''
%
(
form
[
'q'
].
value
,
file_data
))
super
(
WebServerMixin
,
self
).
setUp
()
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
)
port
=
findFreeTCPPort
(
ip
)
server
=
HTTPServer
((
ip
,
port
),
TestHandler
)
server
=
HTTPServer
((
ip
,
port
),
TestHandler
)
self
.
server_process
=
multiprocessing
.
Process
(
target
=
server
.
serve_forever
)
self
.
server_process
=
multiprocessing
.
Process
(
target
=
server
.
serve_forever
)
...
...
software/seleniumserver/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
software/slaprunner/test/test.py
View file @
e26843de
...
@@ -40,7 +40,7 @@ import psutil
...
@@ -40,7 +40,7 @@ import psutil
import
utils
import
utils
# for development: debugging logs and install Ctrl+C handler
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'DEBUG'
):
if
os
.
environ
.
get
(
'
SLAPOS_TEST_
DEBUG'
):
import
logging
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
import
unittest
...
...
software/slaprunner/test/utils.py
View file @
e26843de
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -187,8 +187,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
'slapos_binary'
:
'slapos'
,
'slapos_binary'
:
'slapos'
,
}
}
# Some tests are expecting that local IP is not set to 127.0.0.1
# 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'
)
ipv4_address
=
os
.
environ
.
get
(
'
SLAPOS_TEST
_IPV4'
,
'127.0.1.1'
)
ipv6_address
=
os
.
environ
[
'
GLOBAL
_IPV6'
]
ipv6_address
=
os
.
environ
[
'
SLAPOS_TEST
_IPV6'
]
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'proxy_host'
]
=
cls
.
config
[
'ipv4_address'
]
=
ipv4_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
cls
.
config
[
'ipv6_address'
]
=
ipv6_address
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment