almalinux/lorax
15
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust test_server and test blueprints so they depsolve

Browse Source
This commit is contained in:
Brian C. Lane 2018-07-24 14:53:04 -07:00
parent fab8c0786d
commit 2f76700926
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/pylorax/blueprints/glusterfs.toml
View File

@ -6,9 +6,9 @@ name = "glusterfs"
version = "4.0.*" version = "4.0.*"
[[modules]] [[modules]]
name = "glusterfs-cli" name = "glusterfs-fuse"
version = "4.0.*" version = "4.0.*"
[[packages]] [[packages]]
name = "samba" name = "samba"
version = "4.8.*" version = "4.*.*"

8
tests/pylorax/blueprints/http-server.toml
View File

@ -7,8 +7,8 @@ name = "httpd"
version = "2.4.*" version = "2.4.*"
[[modules]] [[modules]]
name = "mod_auth_openid" name = "mod_auth_openidc"
version = "0.8" version = "1.8.10.*"
[[modules]] [[modules]]
name = "mod_ssl" name = "mod_ssl"
@ -16,11 +16,11 @@ version = "2.4.*"
[[modules]] [[modules]]
name = "php" name = "php"
version = "7.2.4" version = "7.2.*"
[[modules]] [[modules]]
name = "php-mysqlnd" name = "php-mysqlnd"
version = "7.2.4" version = "7.2.*"
[[packages]] [[packages]]
name = "tmux" name = "tmux"

2
tests/pylorax/blueprints/jboss.toml
View File

@ -3,7 +3,7 @@ description = "An example jboss server"
version = "0.0.1" version = "0.0.1"
[[modules]] [[modules]]
name = "jboss-servlet-3.1-api" name = "jboss-servlet-2.5-api"
version = "1.0.*" version = "1.0.*"
[[modules]] [[modules]]

36
tests/pylorax/test_server.py
View File

@ -118,10 +118,10 @@ class ServerTestCase(unittest.TestCase):
"errors":[], "errors":[],
"blueprints":[{"description":"An example http server with PHP and MySQL support.", "blueprints":[{"description":"An example http server with PHP and MySQL support.",
"modules":[{"name":"httpd", "version":"2.4.*"}, "modules":[{"name":"httpd", "version":"2.4.*"},
{"name":"mod_auth_openid", "version":"0.8"}, {"name":"mod_auth_openidc", "version":"1.8.10.*"},
{"name":"mod_ssl", "version":"2.4.*"}, {"name":"mod_ssl", "version":"2.4.*"},
{"name":"php", "version":"7.2.4"}, {"name":"php", "version":"7.2.*"},
{"name": "php-mysqlnd", "version":"7.2.4"}], {"name": "php-mysqlnd", "version":"7.2.*"}],
"name":"http-server", "name":"http-server",
"packages": [{"name":"openssh-server", "version": "7.*"}, "packages": [{"name":"openssh-server", "version": "7.*"},
{"name": "rsync", "version": "3.1.*"}, {"name": "rsync", "version": "3.1.*"},
@ -139,17 +139,17 @@ class ServerTestCase(unittest.TestCase):
"errors":[], "errors":[],
"blueprints":[{"description": "An example GlusterFS server with samba", "blueprints":[{"description": "An example GlusterFS server with samba",
"modules":[{"name":"glusterfs", "version":"4.0.*"}, "modules":[{"name":"glusterfs", "version":"4.0.*"},
{"name":"glusterfs-cli", "version":"4.0.*"}], {"name":"glusterfs-fuse", "version":"4.0.*"}],
"name":"glusterfs", "name":"glusterfs",
"packages":[{"name":"samba", "version":"4.8.*"}], "packages":[{"name":"samba", "version":"4.*.*"}],
"groups": [], "groups": [],
"version": "0.0.1"}, "version": "0.0.1"},
{"description":"An example http server with PHP and MySQL support.", {"description":"An example http server with PHP and MySQL support.",
"modules":[{"name":"httpd", "version":"2.4.*"}, "modules":[{"name":"httpd", "version":"2.4.*"},
{"name":"mod_auth_openid", "version":"0.8"}, {"name":"mod_auth_openidc", "version":"1.8.10.*"},
{"name":"mod_ssl", "version":"2.4.*"}, {"name":"mod_ssl", "version":"2.4.*"},
{"name":"php", "version":"7.2.4"}, {"name":"php", "version":"7.2.*"},
{"name": "php-mysqlnd", "version":"7.2.4"}], {"name": "php-mysqlnd", "version":"7.2.*"}],
"name":"http-server", "name":"http-server",
"packages": [{"name":"openssh-server", "version": "7.*"}, "packages": [{"name":"openssh-server", "version": "7.*"},
{"name": "rsync", "version": "3.1.*"}, {"name": "rsync", "version": "3.1.*"},
@ -198,8 +198,8 @@ class ServerTestCase(unittest.TestCase):
"name":"glusterfs", "name":"glusterfs",
"version": "0.2.0", "version": "0.2.0",
"modules":[{"name":"glusterfs", "version":"4.0.*"}, "modules":[{"name":"glusterfs", "version":"4.0.*"},
{"name":"glusterfs-cli", "version":"4.0.*"}], {"name":"glusterfs-fuse", "version":"4.0.*"}],
"packages":[{"name":"samba", "version":"4.8.*"}, "packages":[{"name":"samba", "version":"4.*.*"},
{"name":"tmux", "version":"2.7"}], {"name":"tmux", "version":"2.7"}],
"groups": []} "groups": []}
@ -249,8 +249,8 @@ class ServerTestCase(unittest.TestCase):
"name":"glusterfs", "name":"glusterfs",
"version": "0.3.0", "version": "0.3.0",
"modules":[{"name":"glusterfs", "version":"4.0.*"}, "modules":[{"name":"glusterfs", "version":"4.0.*"},
{"name":"glusterfs-cli", "version":"4.0.*"}], {"name":"glusterfs-fuse", "version":"4.0.*"}],
"packages":[{"name":"samba", "version":"4.8.*"}, "packages":[{"name":"samba", "version":"4.*.*"},
{"name":"tmux", "version":"2.7"}], {"name":"tmux", "version":"2.7"}],
"groups": []} "groups": []}
@ -276,8 +276,8 @@ class ServerTestCase(unittest.TestCase):
"name":"glusterfs", "name":"glusterfs",
"version": "0.4.0", "version": "0.4.0",
"modules":[{"name":"glusterfs", "version":"4.0.*"}, "modules":[{"name":"glusterfs", "version":"4.0.*"},
{"name":"glusterfs-cli", "version":"4.0.*"}], {"name":"glusterfs-fuse", "version":"4.0.*"}],
"packages":[{"name":"samba", "version":"4.8.*"}, "packages":[{"name":"samba", "version":"4.*.*"},
{"name":"tmux", "version":"2.7"}], {"name":"tmux", "version":"2.7"}],
"groups": []} "groups": []}
@ -408,8 +408,8 @@ class ServerTestCase(unittest.TestCase):
"name":"glusterfs", "name":"glusterfs",
"version": "0.3.0", "version": "0.3.0",
"modules":[{"name":"glusterfs", "version":"4.0.*"}, "modules":[{"name":"glusterfs", "version":"4.0.*"},
{"name":"glusterfs-cli", "version":"4.0.*"}], {"name":"glusterfs-fuse", "version":"4.0.*"}],
"packages":[{"name":"samba", "version":"4.8.*"}, "packages":[{"name":"samba", "version":"4.*.*"},
{"name":"tmux", "version":"2.7"}]} {"name":"tmux", "version":"2.7"}]}
resp = self.server.post("/api/v0/blueprints/workspace", resp = self.server.post("/api/v0/blueprints/workspace",
@ -674,8 +674,8 @@ class ServerTestCase(unittest.TestCase):
"name":"glusterfs", "name":"glusterfs",
"version": "0.2.0", "version": "0.2.0",
"modules":[{"name":"glusterfs", "version":"4.0.*"}, "modules":[{"name":"glusterfs", "version":"4.0.*"},
{"name":"glusterfs-cli", "version":"4.0.*"}], {"name":"glusterfs-fuse", "version":"4.0.*"}],
"packages":[{"name":"samba", "version":"4.8.*"}, "packages":[{"name":"samba", "version":"4.*.*"},
{"name":"tmux", "version":"2.7"}], {"name":"tmux", "version":"2.7"}],
"groups": []} "groups": []}