diff --git a/cloud-init.spec b/cloud-init.spec index dbcab1a..127047d 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -38,8 +38,6 @@ Patch11: cloud-init-0.7.8-nm-controlled.patch # Requires pylxd Patch12: tests-Neuter-lxd-testing.patch -# Not debugged/upstreamed yet -Patch14: disable-failing-tests.patch BuildArch: noarch diff --git a/disable-failing-tests.patch b/disable-failing-tests.patch deleted file mode 100644 index 7f4306e..0000000 --- a/disable-failing-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tests/cloud_tests/testcases/__init__.py b/tests/cloud_tests/testcases/__init__.py -index 182c090..86006ce 100644 ---- a/tests/cloud_tests/testcases/__init__.py -+++ b/tests/cloud_tests/testcases/__init__.py -@@ -3,11 +3,12 @@ - import importlib - import inspect - import unittest -+from nose.tools import nottest - - from tests.cloud_tests import config - from tests.cloud_tests.testcases.base import CloudTestCase as base_test - -- -+@nottest - def discover_tests(test_name): - """ - discover tests in test file for 'testname' -diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py -index 5395b9a..25c11ab 100644 ---- a/tests/cloud_tests/testcases/base.py -+++ b/tests/cloud_tests/testcases/base.py -@@ -69,6 +69,7 @@ class CloudTestCase(unittest.TestCase): - """ - ensure that there were no errors in any stage - """ -+ return # no idea why this is broken - status = self.get_status_data(self.get_data_file('status.json')) - for stage in ('init', 'init-local', 'modules-config', 'modules-final'): - self.assertIn(stage, status)