openstack/nova
Code Issues Proposed changes

Merge "Renaming xml test class in sample tests of consoles API."

Browse Source
This commit is contained in:
Jenkins 2012-12-03 17:12:52 +00:00 committed by Gerrit Code Review
commit c783a97326
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api_samples/os-consoles/get-vnc-console-post-resp.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<console>
<type>novnc</type>
<url>http://example.com:6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3&title=dafa(75ecef58-3b8e-4659-ab3b-5501454188e9)</url>
<type>novnc</type>
<url>http://example.com:6080/vnc_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url>
</console>

4
nova/tests/integrated/api_samples/os-consoles/get-vnc-console-post-req.xml.tpl
View File

@ -1,2 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<os-getVNCConsole type="novnc" />
<os-getVNCConsole>
<type>novnc</type>
</os-getVNCConsole>

2
nova/tests/integrated/test_api_samples.py
View File

@ -1660,7 +1660,7 @@ class ConsolesSampleJsonTests(ServersSampleBase):
subs, response)
class ConsoleOutputSampleXmlTests(ConsoleOutputSampleJsonTest):
class ConsolesSampleXmlTests(ConsolesSampleJsonTests):
ctype = 'xml'