Separate create and build templates

In order to prevent build templates to render during plugin
creation we need to put them into different directories.

Change-Id: I439bc7618a43ad07cc73fb69b60d99d725c3f9d0
Closes-Bug: #1655289
This commit is contained in:
Georgy Kibardin 2017-01-13 13:27:27 +03:00
parent 6a1ae7f520
commit 9d819b1efc
11 changed files with 13 additions and 10 deletions

View File

@ -31,7 +31,7 @@ class TestVersionMapping(BaseTestCase):
self.assertEqual(result['version'], '1.0.0')
self.assertEqual(
result['templates'],
['templates/base', 'templates/v1/'])
['templates/base/plugin_data', 'templates/v1/plugin_data/'])
self.assertEqual(result['validator'], ValidatorV1)
def test_get_plugin_for_version_2(self):
@ -39,7 +39,7 @@ class TestVersionMapping(BaseTestCase):
self.assertEqual(result['version'], '2.0.0')
self.assertEqual(
result['templates'],
['templates/base', 'templates/v2/plugin_data/'])
['templates/base/plugin_data', 'templates/v2/plugin_data/'])
self.assertEqual(result['validator'], ValidatorV2)
def test_get_plugin_for_version_3(self):
@ -47,7 +47,7 @@ class TestVersionMapping(BaseTestCase):
self.assertEqual(result['version'], '3.0.0')
self.assertEqual(
result['templates'],
['templates/base', 'templates/v3/plugin_data/'])
['templates/base/plugin_data', 'templates/v3/plugin_data/'])
self.assertEqual(result['validator'], ValidatorV3)
def test_get_plugin_for_version_4(self):
@ -56,7 +56,7 @@ class TestVersionMapping(BaseTestCase):
self.assertEqual(
result['templates'],
[
'templates/base',
'templates/base/plugin_data',
'templates/v3/plugin_data/',
'templates/v4/plugin_data/'])
self.assertEqual(result['validator'], ValidatorV4)
@ -67,7 +67,7 @@ class TestVersionMapping(BaseTestCase):
self.assertEqual(
result['templates'],
[
'templates/base',
'templates/base/plugin_data',
'templates/v3/plugin_data/',
'templates/v4/plugin_data/',
'templates/v5/plugin_data/'])

View File

@ -30,27 +30,30 @@ def get_mapping():
return [
{'version': '1.0.0',
'templates': ['templates/base', 'templates/v1/'],
'templates': ['templates/base/plugin_data',
'templates/v1/plugin_data/'],
'validator': validators.ValidatorV1,
'builder': build.BuildPluginV1},
{'version': '2.0.0',
'templates': ['templates/base', 'templates/v2/plugin_data/'],
'templates': ['templates/base/plugin_data',
'templates/v2/plugin_data/'],
'validator': validators.ValidatorV2,
'builder': build.BuildPluginV2},
{'version': '3.0.0',
'templates': ['templates/base', 'templates/v3/plugin_data/'],
'templates': ['templates/base/plugin_data',
'templates/v3/plugin_data/'],
'validator': validators.ValidatorV3,
'builder': build.BuildPluginV3},
{'version': '4.0.0',
'templates': [
'templates/base',
'templates/base/plugin_data',
'templates/v3/plugin_data/',
'templates/v4/plugin_data/'],
'validator': validators.ValidatorV4,
'builder': build.BuildPluginV4},
{'version': '5.0.0',
'templates': [
'templates/base',
'templates/base/plugin_data',
'templates/v3/plugin_data/',
'templates/v4/plugin_data/',
'templates/v5/plugin_data/'],