Merge "Drop test_node_label" into feature/zuulv3
diff --git a/tests/fixtures/custom_functions.py b/tests/fixtures/custom_functions.py
deleted file mode 100644
index 4712052..0000000
--- a/tests/fixtures/custom_functions.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def select_debian_node(item, params):
- params['ZUUL_NODE'] = 'debian'
diff --git a/tests/fixtures/custom_functions_live_reconfiguration_functions.py b/tests/fixtures/custom_functions_live_reconfiguration_functions.py
deleted file mode 100644
index d8e06f4..0000000
--- a/tests/fixtures/custom_functions_live_reconfiguration_functions.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def select_debian_node(item, params):
- params['ZUUL_NODE'] = 'wheezy'
diff --git a/tests/fixtures/layout-live-reconfiguration-functions.yaml b/tests/fixtures/layout-live-reconfiguration-functions.yaml
index e261a88..b22b3ab 100644
--- a/tests/fixtures/layout-live-reconfiguration-functions.yaml
+++ b/tests/fixtures/layout-live-reconfiguration-functions.yaml
@@ -26,12 +26,3 @@
- name: ^.*-merge$
failure-message: Unable to merge change
hold-following-changes: true
- - name: node-project-test1
- parameter-function: select_debian_node
-
-projects:
- - name: org/node-project
- gate:
- - node-project-merge:
- - node-project-test1
- - node-project-test2
diff --git a/tests/fixtures/layout.yaml b/tests/fixtures/layout.yaml
index eb8f17c..6131de0 100644
--- a/tests/fixtures/layout.yaml
+++ b/tests/fixtures/layout.yaml
@@ -129,8 +129,6 @@
- name: project-testfile
files:
- '.*-requires'
- - name: node-project-test1
- parameter-function: select_debian_node
- name: project1-project2-integration
queue-name: integration
- name: mutex-one
@@ -216,12 +214,6 @@
post:
- nonvoting-project-post
- - name: org/node-project
- gate:
- - node-project-merge:
- - node-project-test1
- - node-project-test2
-
- name: org/conflict-project
conflict:
- conflict-project-merge:
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index e3da6f7..4a84b77 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -56,6 +56,7 @@
self.assertEqual(A.reported, 2)
self.assertEqual(self.getJobFromHistory('project-test1').node,
'image1')
+ self.assertIsNone(self.getJobFromHistory('project-test2').node)
# TODOv3(jeblair): we may want to report stats by tenant (also?).
self.assertReportedStat('gerrit.event.comment-added', value='1|c')
@@ -2245,21 +2246,6 @@
self.assertEqual(B.reported, 1)
self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
- @skip("Disabled for early v3 development")
- def test_node_label(self):
- "Test that a job runs on a specific node label"
- self.worker.registerFunction('build:node-project-test1:debian')
-
- A = self.fake_gerrit.addFakeChange('org/node-project', 'master', 'A')
- A.addApproval('code-review', 2)
- self.fake_gerrit.addEvent(A.addApproval('approved', 1))
- self.waitUntilSettled()
-
- self.assertIsNone(self.getJobFromHistory('node-project-merge').node)
- self.assertEqual(self.getJobFromHistory('node-project-test1').node,
- 'debian')
- self.assertIsNone(self.getJobFromHistory('node-project-test2').node)
-
def test_live_reconfiguration(self):
"Test that live reconfiguration works"
self.launch_server.hold_jobs_in_build = True