Remove disable-failing-tests.patch

I can't seem to reproduce this failure locally or in koji.
This commit is contained in:
Garrett Holmstrom 2017-01-26 18:01:32 -08:00
parent 8edfbaca38
commit 6a4665fa53
2 changed files with 0 additions and 32 deletions

View File

@ -38,8 +38,6 @@ Patch11: cloud-init-0.7.8-nm-controlled.patch
# Requires pylxd # Requires pylxd
Patch12: tests-Neuter-lxd-testing.patch Patch12: tests-Neuter-lxd-testing.patch
# Not debugged/upstreamed yet
Patch14: disable-failing-tests.patch
BuildArch: noarch BuildArch: noarch

View File

@ -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)