x/cloudbase-init
Code Issues Proposed changes

Move remaining cloudconfigplugins test files to plugins.common

Browse Source 
There were some files which weren't moved in the proper location
when the dichotomy between common and Windows-specific plugins was
established. This patch moves the test_write_files in the proper
location and updates the paths from the code.

Change-Id: I7aa314b849eda192eedbd4988b83342bf2c1c5c0
This commit is contained in:
Claudiu Popa
2015-03-23 12:44:28 +02:00
parent dff247dcaa
commit 0ccea78de6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
cloudbaseinit/tests/plugins/windows/userdataplugins/cloudconfigplugins/__init__.py → cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/__init__.py
View File

14
cloudbaseinit/tests/plugins/windows/userdataplugins/cloudconfigplugins/test_write_files.py → cloudbaseinit/tests/plugins/common/userdataplugins/cloudconfigplugins/test_write_files.py
View File

@@ -24,8 +24,8 @@ except ImportError:
import mock
from oslo.config import cfg
from cloudbaseinit.plugins.windows.userdataplugins import cloudconfig
from cloudbaseinit.plugins.windows.userdataplugins.cloudconfigplugins import (
from cloudbaseinit.plugins.common.userdataplugins import cloudconfig
from cloudbaseinit.plugins.common.userdataplugins.cloudconfigplugins import (
write_files
)
from cloudbaseinit.tests import testutils
@@ -106,7 +106,7 @@ class WriteFilesPluginTests(unittest.TestCase):
tmp = self._get_tempfile()
code = code.format(tmp)
with testutils.LogSnatcher('cloudbaseinit.plugins.windows.'
with testutils.LogSnatcher('cloudbaseinit.plugins.common.'
'userdataplugins.cloudconfig') as snatcher:
self.plugin.process_non_multipart(code)
@@ -136,14 +136,14 @@ class WriteFilesPluginTests(unittest.TestCase):
"information {'c0ntent': 'NDI='}"
]
with testutils.LogSnatcher('cloudbaseinit.plugins.windows.'
with testutils.LogSnatcher('cloudbaseinit.plugins.common.'
'userdataplugins.cloudconfigplugins.'
'write_files') as snatcher:
self.plugin.process_non_multipart(code)
self.assertEqual(expected_return, snatcher.output)
@mock.patch('cloudbaseinit.plugins.windows.userdataplugins.'
@mock.patch('cloudbaseinit.plugins.common.userdataplugins.'
'cloudconfigplugins.write_files.WriteFilesPlugin.process')
def test_processing_plugin_failed(self, mock_write_files):
mock_write_files.side_effect = ValueError
@@ -153,7 +153,7 @@ class WriteFilesPluginTests(unittest.TestCase):
path: random_cloudbaseinit_test
""")
with testutils.LogSnatcher('cloudbaseinit.plugins.windows.'
with testutils.LogSnatcher('cloudbaseinit.plugins.common.'
'userdataplugins.cloudconfig') as snatcher:
self.plugin.process_non_multipart(code)
@@ -170,7 +170,7 @@ class WriteFilesPluginTests(unittest.TestCase):
path: {}
permissions: '0o466'
""".format(tmp))
with testutils.LogSnatcher('cloudbaseinit.plugins.windows.'
with testutils.LogSnatcher('cloudbaseinit.plugins.common.'
'userdataplugins.cloudconfigplugins.'
'write_files') as snatcher:
self.plugin.process_non_multipart(code)