peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-02 05:43:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: minor, cleanup

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-10-23 10:08:10 +02:00
parent 822cb93265
commit 64c20d96ad
6 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/case/infix_containers/container_basic/test.py
+2 -2
View File
@@ -20,7 +20,7 @@ from infamy.util import until
def _verify(server):
# Should really use mDNS here....
# TODO: Should really use mDNS here....
url = infamy.Furl(f"http://[{server}]:91/index.html")
return url.check("It works")
@@ -49,7 +49,7 @@ with infamy.Test() as test:
"container": [
{
"name": f"{NAME}",
"image": f"oci-archive:{infamy.Container.IMAGE}",
"image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}",
"command": "/usr/sbin/httpd -f -v -p 91",
"network": {
"host": True
test/case/infix_containers/container_bridge/test.py
+1 -2
View File
@@ -20,7 +20,6 @@ from infamy.util import until
with infamy.Test() as test:
NAME = "web-docker0"
IMAGE = "curios-httpd-edge.tar.gz"
DUTIP = "10.0.0.2"
OURIP = "10.0.0.1"
BODY = "<html><body><p>Kilroy was here</p></body></html>"
@@ -67,7 +66,7 @@ with infamy.Test() as test:
"container": [
{
"name": f"{NAME}",
"image": f"oci-archive:{infamy.Container.IMAGE}",
"image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}",
"command": "/usr/sbin/httpd -f -v -p 91",
"mount": [
{
test/case/infix_containers/container_phys/test.py
+1 -2
View File
@@ -15,7 +15,6 @@ from infamy.util import until
with infamy.Test() as test:
NAME = "web-phys"
IMAGE = "curios-httpd-edge.tar.gz"
DUTIP = "10.0.0.2"
OURIP = "10.0.0.1"
URL = f"http://{DUTIP}:91/index.html"
@@ -51,7 +50,7 @@ with infamy.Test() as test:
"container": [
{
"name": f"{NAME}",
"image": f"oci-archive:{infamy.Container.IMAGE}",
"image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}",
"command": "/usr/sbin/httpd -f -v -p 91",
"network": {
"interface": [
test/case/infix_containers/container_veth/Readme.adoc
+1 -1
View File
@@ -5,7 +5,7 @@ regular bridge, a VETH pair connects the container to the bridge.
....
.-------------. .---------------. .--------.
| | tgt |---------| mgmt | | | web- |
| | mgmt |---------| mgmt | | | web- |
| host | data |---------| data | target | | server |
'-------------' '---------------' '--------'
| /
test/case/infix_containers/container_veth/test.py
+2 -3
View File
@@ -11,7 +11,7 @@ regular bridge, a VETH pair connects the container to the bridge.
....
.-------------. .---------------. .--------.
| | tgt |---------| mgmt | | | web- |
| | mgmt |---------| mgmt | | | web- |
| host | data |---------| data | target | | server |
'-------------' '---------------' '--------'
| /
@@ -26,7 +26,6 @@ from infamy.util import until
with infamy.Test() as test:
NAME = "web-br0-veth"
IMAGE = "curios-httpd-edge.tar.gz"
DUTIP = "10.0.0.2"
OURIP = "10.0.0.1"
URL = f"http://{DUTIP}:91/index.html"
@@ -85,7 +84,7 @@ with infamy.Test() as test:
"container": [
{
"name": f"{NAME}",
"image": f"oci-archive:{infamy.Container.IMAGE}",
"image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}",
"command": "/usr/sbin/httpd -f -v -p 91",
"network": {
"interface": [
test/infamy/container.py
+1 -1
View File
@@ -5,7 +5,7 @@ from infamy.util import warn
class Container:
"""Helper methods"""
IMAGE = "curios-httpd-v24.05.0.tar.gz"
HTTPD_IMAGE = "curios-httpd-v24.05.0.tar.gz"
def __init__(self, target):
self.system = target