From 4a66b5b0855a7e0c9e0753b9ce733cf6062f3984 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Mon, 17 Sep 2018 09:53:36 +0200 Subject: [PATCH] tests: Fix tests so they run on Fedora 28 Broaden the match for Samba in the glusterfs blueprint so it can work on Fedora 28 --- tests/pylorax/blueprints/example-glusterfs.toml | 2 +- tests/pylorax/test_server.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/pylorax/blueprints/example-glusterfs.toml b/tests/pylorax/blueprints/example-glusterfs.toml index 2272a8e0..0eb73311 100644 --- a/tests/pylorax/blueprints/example-glusterfs.toml +++ b/tests/pylorax/blueprints/example-glusterfs.toml @@ -11,4 +11,4 @@ version = "4.1.*" [[packages]] name = "samba" -version = "4.9.*" +version = "4.*.*" diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py index ca6e3923..4eae5cb0 100644 --- a/tests/pylorax/test_server.py +++ b/tests/pylorax/test_server.py @@ -177,7 +177,7 @@ class ServerTestCase(unittest.TestCase): "modules":[{"name":"glusterfs", "version":"4.1.*"}, {"name":"glusterfs-cli", "version":"4.1.*"}], "name":"example-glusterfs", - "packages":[{"name":"samba", "version":"4.9.*"}], + "packages":[{"name":"samba", "version":"4.*.*"}], "groups": [], "version": "0.0.1"}, {"description":"An example http server with PHP and MySQL support.", @@ -242,7 +242,7 @@ class ServerTestCase(unittest.TestCase): "version": "0.2.0", "modules":[{"name":"glusterfs", "version":"4.1.*"}, {"name":"glusterfs-cli", "version":"4.1.*"}], - "packages":[{"name":"samba", "version":"4.9.*"}, + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []} @@ -293,7 +293,7 @@ class ServerTestCase(unittest.TestCase): "version": "0.3.0", "modules":[{"name":"glusterfs", "version":"4.1.*"}, {"name":"glusterfs-cli", "version":"4.1.*"}], - "packages":[{"name":"samba", "version":"4.9.*"}, + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []} @@ -320,7 +320,7 @@ class ServerTestCase(unittest.TestCase): "version": "0.4.0", "modules":[{"name":"glusterfs", "version":"4.1.*"}, {"name":"glusterfs-cli", "version":"4.1.*"}], - "packages":[{"name":"samba", "version":"4.9.*"}, + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []} @@ -452,7 +452,7 @@ class ServerTestCase(unittest.TestCase): "version": "0.3.0", "modules":[{"name":"glusterfs", "version":"4.1.*"}, {"name":"glusterfs-cli", "version":"4.1.*"}], - "packages":[{"name":"samba", "version":"4.9.*"}, + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}]} resp = self.server.post("/api/v0/blueprints/workspace", @@ -729,7 +729,7 @@ class ServerTestCase(unittest.TestCase): "version": "0.2.0", "modules":[{"name":"glusterfs", "version":"4.1.*"}, {"name":"glusterfs-cli", "version":"4.1.*"}], - "packages":[{"name":"samba", "version":"4.9.*"}, + "packages":[{"name":"samba", "version":"4.*.*"}, {"name":"tmux", "version":"2.7"}], "groups": []}