From baaaff17b5a57347cc19a896040d8c3ddd6fe8b1 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Wed, 17 Jul 2019 13:24:44 +0100 Subject: [PATCH] Make placement testing easier on osx Placement can run just fine on OSX but running the tests can be a bit cumbersome since dev libraries for ssl, postresql, and mysql are required (directly or indirectly) by test-requirements.txt, even though for non-gate testing we don't usually need them, and dealing with dynamic libraries is a frequent source of pain and discomfort on OSX. This change says "don't import SQL drivers for mysql and postgresql when testing on darwin". Change-Id: Ic0ff55f00e0312251207fd079cf7b7e98d950c87 --- test-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index ace08119a..3f8a93fc3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,8 +6,8 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD mock>=2.0.0 # BSD -psycopg2>=2.6.2 # LGPL/ZPL -PyMySQL>=0.7.6 # MIT License +psycopg2>=2.6.2; sys_platform!='darwin' # LGPL/ZPL +PyMySQL>=0.7.6; sys_platform!='darwin' # MIT License oslotest>=3.4.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testtools>=2.2.0 # MIT