summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2011-02-08 12:56:40 +1000
committerDan Callaghan <dcallagh@redhat.com>2011-02-08 13:08:34 +1000
commite6a151b65af7a08dc18c9804e18eaefe9d5d0811 (patch)
tree21b0c6aadb561324b0f4fe0d4d499793dc67f094
parentcf67ddacd0e76036936eb404c73cd49df1180de0 (diff)
fix for TestLabController: ensure correct distro is pickedbeaker-distribution-inventory-1_1-39
When this test is run as part of the full test suite, there will be many distros with the same name (only install name will be unique). But we need to make sure the right one is used in this test, otherwise it won't be present in the lab controller we create and hence the job will never be scheduled. Change-Id: I396135fa61750b086e5bac82fe736ccfb486147b
-rw-r--r--Server/bkr/server/test/test_lab_controller.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Server/bkr/server/test/test_lab_controller.py b/Server/bkr/server/test/test_lab_controller.py
index e086045..002a0d4 100644
--- a/Server/bkr/server/test/test_lab_controller.py
+++ b/Server/bkr/server/test/test_lab_controller.py
@@ -24,6 +24,7 @@ class TestLabController(unittest.TestCase):
<recipe>
<distroRequires>
<distro_name op="=" value="%s" />
+ <distrolabcontroller op="=" value="%s" />
</distroRequires>
<hostRequires>
<hostname op="=" value="%s"/>
@@ -34,7 +35,7 @@ class TestLabController(unittest.TestCase):
</recipe>
</recipeSet>
</job>
- ''' % (distro, system.fqdn)))
+ ''' % (distro.name, self.lc.fqdn, system.fqdn)))
controller = Jobs()
system.lab_controller = self.lc
data_setup.create_task(name=u'/distribution/install')