← Back to branch summary

~ubuntu-branches/ubuntu/raring/checkbox/raring

« back to all changes in this revision

Viewing changes to plainbox/plainbox/impl/test_box.py

  • Committer: Daniel Manrique
  • Date: 2013-02-08 18:32:10 UTC
  • mfrom: (1877.1.1 ubuntu-candidate)
  • Revision ID: roadmr@ubuntu.com-20130208183210-u5o8hkvvu5n1cxlo
Tags: 0.15.2
https://launchpad.net/bugs/1102665
https://launchpad.net/bugs/1102812
https://launchpad.net/bugs/1103343
https://launchpad.net/bugs/1119529
* New upstream release (LP: #1119529)
* Bumped revision number to 0.15.1 and restored previous trunk changelog.
* jobs/peripheral.txt.in: fixed string with repeated "add" (LP: #1102665) 
* scripts/graphics_stress_test: added missing import (LP: #1102812)
* scripts/rendercheck_test - added missing import for errno (LP: #1103343)
  jobs/rendercheck.txt.in - fixed command string to report the correct exit
  code to checkbox

* Converted kvm virtualization test to python3. Test will use parameters
  in config file in the event the system under test does not have internet
  access. Updated jobs/virtualization.txt.in

Show diffs side-by-side

added added

removed removed

Lines of Context:
plainbox/plainbox/impl/test_box.py
237
237
                main(['run', '--output-format=?'])
238
238
            self.assertEqual(call.exception.args, (0,))
239
239
        expected = """
240
 
        Available output formats: text, json, rfc822, yaml
 
240
        Available output formats: json, rfc822, text, yaml
241
241
        """
242
242
        self.assertEqual(io.combined, cleandoc(expected) + "\n")
243
243
 
248
248
            self.assertEqual(call.exception.args, (0,))
249
249
        expected = """
250
250
        Each format may support a different set of options
251
 
        text: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs
252
251
        json: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs, machine-json
253
252
        rfc822: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs
 
253
        text: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs
254
254
        yaml: with-io-log, squash-io-log, flatten-io-log, with-run-list, with-job-list, with-resource-map, with-job-defs
255
255
        """
256
256
        self.assertEqual(io.combined, cleandoc(expected) + "\n")