Merge "Re-enable 4 disable tests" into feature/zuulv3
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 0295494..803b22d 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -1892,7 +1892,6 @@
self.launch_server.release()
self.waitUntilSettled()
- @skip("Disabled for early v3 development")
def test_zuul_url_return(self):
"Test if ZUUL_URL is returning when zuul_url is set in zuul.conf"
self.assertTrue(self.sched.config.has_option('merger', 'zuul_url'))
@@ -1911,7 +1910,6 @@
self.launch_server.release()
self.waitUntilSettled()
- @skip("Disabled for early v3 development")
def test_new_patchset_dequeues_old_on_head(self):
"Test that a new patchset causes the old to be dequeued (at head)"
# D -> C (depends on B) -> B (depends on A) -> A -> M
@@ -1955,7 +1953,6 @@
self.assertEqual(D.reported, 2)
self.assertEqual(len(self.history), 7)
- @skip("Disabled for early v3 development")
def test_new_patchset_dequeues_old_without_dependents(self):
"Test that a new patchset causes only the old to be dequeued"
self.launch_server.hold_jobs_in_build = True
@@ -1987,7 +1984,6 @@
self.assertEqual(C.reported, 2)
self.assertEqual(len(self.history), 9)
- @skip("Disabled for early v3 development")
def test_new_patchset_dequeues_old_independent_queue(self):
"Test that a new patchset causes the old to be dequeued (independent)"
self.launch_server.hold_jobs_in_build = True