Merge lp:~pitti/uci-engine/test_runner into lp:uci-engine

[Martin Pitt]

Fix test_runner test_wait_for_instance_fails test case to accept instance UUID in error message

Fix failing test_runner test case, see commit log.

[Vincent Ladeuil (vila)]

Urgh, I have the fix, uncommitted in my trunk :-(

=== modified file 'test_runner/tstrun/tests/test_testbed.py'
--- test_runner/tstrun/tests/test_testbed.py 2014-08-24 21:27:36 +0000
+++ test_runner/tstrun/tests/test_testbed.py 2014-09-17 14:48:12 +0000
@@ -263,8 +263,9 @@
         self.addCleanup(tb.teardown)
         with self.assertRaises(testbed.TestBedException) as cm:
             tb.setup()
- self.assertEqual('Instance never came up (last status: BUILD)',
- unicode(cm.exception))
+ msg = 'Instance {} never came up (last status: BUILD)'
+ msg = msg.format(tb.instance.id)
+ self.assertEqual(msg, unicode(cm.exception))

Since it's more precise (the instance id is known), would you mind using that instead ?

review: Needs Information

[Martin Pitt (pitti)]

Ah sure. I'm fine with deleting this MP and we just take your's; or I adjust this MP accordingly, as you prefer.

[lp:~pitti/uci-engine/test_runner]

792. By Martin Pitt on 2014-09-22

Fix test_runner test_wait_for_instance_fails test case

This currently fails with

  ======================================================================
  FAIL: test_runner.tstrun.tests.test_testbed.TestTestbed.test_wait_for_instance_fails
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File "test_runner/tstrun/tests/test_testbed.py", line 267, in test_wait_for_instance_fails
      unicode(cm.exception))
  [...]
  AssertionError: u'Instance never came up (last status: BUILD)' != u'Instance 39b7a267-b2f9-480b-9fc0-50f3e5aae23b never came up (last status: BUIL [truncated]...
  - Instance never came up (last status: BUILD)
  + Instance 39b7a267-b2f9-480b-9fc0-50f3e5aae23b never came up (last status: BUILD)

Include the UUID in the expected string.

[Martin Pitt (pitti)]

Adjusted accordingly.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:792
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1427/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1427/rebuild

review: Approve (continuous-integration)

[Vincent Ladeuil (vila)]

Thanks !

review: Approve

=== modified file 'test_runner/tstrun/tests/test_testbed.py'
--- test_runner/tstrun/tests/test_testbed.py	2014-08-24 21:27:36 +0000
+++ test_runner/tstrun/tests/test_testbed.py	2014-09-22 09:40:37 +0000
@@ -263,8 +263,9 @@
         self.addCleanup(tb.teardown)
         with self.assertRaises(testbed.TestBedException) as cm:
             tb.setup()
-        self.assertEqual('Instance never came up (last status: BUILD)',
-                         unicode(cm.exception))
+        msg = 'Instance {} never came up (last status: BUILD)'
+        msg = msg.format(tb.instance.id)
+        self.assertEqual(msg, unicode(cm.exception))
 
     def test_wait_for_ip_fails(self):
         self.conf.set('vm.image', self.get_image_id())