diff --git a/debian/patches/Make_unittests_loadable b/debian/patches/Make_unittests_loadable new file mode 100644 index 0000000..72e41f8 --- /dev/null +++ b/debian/patches/Make_unittests_loadable @@ -0,0 +1,52 @@ +From: Adam Cecile +Date: Tue, 7 Jan 2020 13:57:12 +0100 +Subject: UnitTest cannot be run at all without CCM +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Because this third party module is imported from __init__ files breaking +nose while analysing available test (so --ignore-file cannot help) + +python-cassandra-driver (3.20.2-1) unstable; urgency=medium + + [ Ondřej Nový ] + * Bump Standards-Version to 4.4.1. + + [ Adam Cecile ] + * New upstream release 3.20.2. + * Add python3-mock dependency now required for unit tests. +--- + tests/integration/__init__.py | 2 +- + tests/integration/upgrade/__init__.py | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py +index c087200..0c5ce19 100644 +--- a/tests/integration/__init__.py ++++ b/tests/integration/__init__.py +@@ -46,7 +46,7 @@ try: + from ccmlib.cluster_factory import ClusterFactory as CCMClusterFactory + from ccmlib import common + except ImportError as e: +- CCMClusterFactory = None ++ raise unittest.SkipTest('ccm is a dependency for integration tests:', e) + + log = logging.getLogger(__name__) + +diff --git a/tests/integration/upgrade/__init__.py b/tests/integration/upgrade/__init__.py +index d2b9076..f782a75 100644 +--- a/tests/integration/upgrade/__init__.py ++++ b/tests/integration/upgrade/__init__.py +@@ -23,7 +23,10 @@ from collections import namedtuple + from functools import wraps + import logging + from threading import Thread, Event +-from ccmlib.node import TimeoutError ++try: ++ from ccmlib.node import TimeoutError ++except ImportError: ++ TimeoutError = Exception + import time + import logging + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f10e03c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +Make_unittests_loadable