diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-02 15:04:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-02 15:04:39 +0000 |
| commit | 2ab0bf7431e155183c7f9d81553eb97a5f459365 (patch) | |
| tree | 1e323703b0c087d4994b7b603e26248c70401364 | |
| parent | cc6800e6abb48dff943e40e60741b58cfaf7c38c (diff) | |
| parent | cb5c61f66be54f5437ca78d62c51ed64aacc383e (diff) | |
Merge "Allow new XML API sample file generation"
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index cbcbb3375..f8bd522fe 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -82,6 +82,9 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): indent=4) else: + if data is None: + # Likely from missing XML file. + return "" xml = etree.XML(data) data = etree.tostring(xml, encoding="UTF-8", xml_declaration=True, pretty_print=True) @@ -236,7 +239,10 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): with file(self._get_sample(name)) as sample: sample_data = sample.read() except IOError: - sample_data = "{}" + if self.ctype == 'json': + sample_data = "{}" + else: + sample_data = None try: response_result = self._verify_something(subs, expected, |