From 2f7670092665df33607b4d650c63148352e41aec Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 24 Jul 2018 14:53:04 -0700 Subject: [PATCH] Adjust test_server and test blueprints so they depsolve --- tests/pylorax/blueprints/glusterfs.toml | 4 +-- tests/pylorax/blueprints/http-server.toml | 8 ++--- tests/pylorax/blueprints/jboss.toml | 2 +- tests/pylorax/test_server.py | 36 +++++++++++------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/pylorax/blueprints/glusterfs.toml b/tests/pylorax/blueprints/glusterfs.toml index 96f50260..73db3b6a 100644 --- a/tests/pylorax/blueprints/glusterfs.toml +++ b/tests/pylorax/blueprints/glusterfs.toml @@ -6,9 +6,9 @@ name = "glusterfs" version = "4.0.*" [[modules]] -name = "glusterfs-cli" +name = "glusterfs-fuse" version = "4.0.*" [[packages]] name = "samba" -version = "4.8.*" +version = "4.*.*" diff --git a/tests/pylorax/blueprints/http-server.toml b/tests/pylorax/blueprints/http-server.toml index db22ff24..d70ceb5e 100644 --- a/tests/pylorax/blueprints/http-server.toml +++ b/tests/pylorax/blueprints/http-server.toml @@ -7,8 +7,8 @@ name = "httpd" version = "2.4.*" [[modules]] -name = "mod_auth_openid" -version = "0.8" +name = "mod_auth_openidc" +version = "1.8.10.*" [[modules]] name = "mod_ssl" @@ -16,11 +16,11 @@ version = "2.4.*" [[modules]] name = "php" -version = "7.2.4" +version = "7.2.*" [[modules]] name = "php-mysqlnd" -version = "7.2.4" +version = "7.2.*" [[packages]] name = "tmux" diff --git a/tests/pylorax/blueprints/jboss.toml b/tests/pylorax/blueprints/jboss.toml index f287323f..5d8ac9aa 100644 --- a/tests/pylorax/blueprints/jboss.toml +++ b/tests/pylorax/blueprints/jboss.toml @@ -3,7 +3,7 @@ description = "An example jboss server" version = "0.0.1" [[modules]] -name = "jboss-servlet-3.1-api" +name = "jboss-servlet-2.5-api" version = "1.0.*" [[modules]] diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py index 671a97bd..df6cfc2f 100644 --- a/tests/pylorax/test_server.py +++ b/tests/pylorax/test_server.py @@ -118,10 +118,10 @@ class ServerTestCase(unittest.TestCase): "errors":[], "blueprints":[{"description":"An example http server with PHP and MySQL support.", "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":"php", "version":"7.2.4"}, - {"name": "php-mysqlnd", "version":"7.2.4"}], + {"name":"php", "version":"7.2.*"}, + {"name": "php-mysqlnd", "version":"7.2.*"}], "name":"http-server", "packages": [{"name":"openssh-server", "version": "7.*"}, {"name": "rsync", "version": "3.1.*"}, @@ -139,17 +139,17 @@ class ServerTestCase(unittest.TestCase): "errors":[], "blueprints":[{"description": "An example GlusterFS server with samba", "modules":[{"name":"glusterfs", "version":"4.0.*"}, - {"name":"glusterfs-cli", "version":"4.0.*"}], + {"name":"glusterfs-fuse", "version":"4.0.*"}], "name":"glusterfs", - "packages":[{"name":"samba", "version":"4.8.*"}], + "packages":[{"name":"samba", "version":"4.*.*"}], "groups": [], "version": "0.0.1"}, {"description":"An example http server with PHP and MySQL support.", "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":"php", "version":"7.2.4"}, - {"name": "php-mysqlnd", "version":"7.2.4"}], + {"name":"php", "version":"7.2.*"}, + {"name": "php-mysqlnd", "version":"7.2.*"}], "name":"http-server", "packages": [{"name":"openssh-server", "version": "7.*"}, {"name": "rsync", "version": "3.1.*"}, @@ -198,8 +198,8 @@ class ServerTestCase(unittest.TestCase): "name":"glusterfs", "version": "0.2.0", "modules":[{"name":"glusterfs", "version":"4.0.*"}, - {"name":"glusterfs-cli", "version":"4.0.*"}], - "packages":[{"name":"samba", "version":"4.8.*"}, + {"name":"glusterfs-fuse", "version":"4.0.*"}], + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []} @@ -249,8 +249,8 @@ class ServerTestCase(unittest.TestCase): "name":"glusterfs", "version": "0.3.0", "modules":[{"name":"glusterfs", "version":"4.0.*"}, - {"name":"glusterfs-cli", "version":"4.0.*"}], - "packages":[{"name":"samba", "version":"4.8.*"}, + {"name":"glusterfs-fuse", "version":"4.0.*"}], + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []} @@ -276,8 +276,8 @@ class ServerTestCase(unittest.TestCase): "name":"glusterfs", "version": "0.4.0", "modules":[{"name":"glusterfs", "version":"4.0.*"}, - {"name":"glusterfs-cli", "version":"4.0.*"}], - "packages":[{"name":"samba", "version":"4.8.*"}, + {"name":"glusterfs-fuse", "version":"4.0.*"}], + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []} @@ -408,8 +408,8 @@ class ServerTestCase(unittest.TestCase): "name":"glusterfs", "version": "0.3.0", "modules":[{"name":"glusterfs", "version":"4.0.*"}, - {"name":"glusterfs-cli", "version":"4.0.*"}], - "packages":[{"name":"samba", "version":"4.8.*"}, + {"name":"glusterfs-fuse", "version":"4.0.*"}], + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}]} resp = self.server.post("/api/v0/blueprints/workspace", @@ -674,8 +674,8 @@ class ServerTestCase(unittest.TestCase): "name":"glusterfs", "version": "0.2.0", "modules":[{"name":"glusterfs", "version":"4.0.*"}, - {"name":"glusterfs-cli", "version":"4.0.*"}], - "packages":[{"name":"samba", "version":"4.8.*"}, + {"name":"glusterfs-fuse", "version":"4.0.*"}], + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []}