Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
f1bd3cfc
Commit
f1bd3cfc
authored
Jul 16, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_erp5: Update to define more ignored items
parent
a82a3790
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
17 deletions
+44
-17
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_administration/ERP5Site_assertDumpedConfiguration.py
...apos_administration/ERP5Site_assertDumpedConfiguration.py
+44
-4
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_administration/expected_portal_skins_dumped_configuration.txt
...nistration/expected_portal_skins_dumped_configuration.txt
+0
-13
No files found.
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_administration/ERP5Site_assertDumpedConfiguration.py
View file @
f1bd3cfc
...
@@ -26,7 +26,12 @@ if show_all or configuration == "builder":
...
@@ -26,7 +26,12 @@ if show_all or configuration == "builder":
if
show_all
or
configuration
==
"bt"
:
if
show_all
or
configuration
==
"bt"
:
expected_file
=
portal
.
expected_business_template_dumped_configuration
expected_file
=
portal
.
expected_business_template_dumped_configuration
found
=
portal
.
ERP5Site_dumpInstalledBusinessTemplateList
(
found
=
portal
.
ERP5Site_dumpInstalledBusinessTemplateList
(
ignore_business_template_list
=
[
"rapid_space_web_site"
])
ignore_business_template_list
=
[
"rapid_space_web_site"
,
'erp5_ui_test_core'
,
'slapos_vifib'
,
'slapos_jio_zh_ui_test'
,
'slapos_jio_ui_test'
,
'rapid_space_ui_test'
])
print
resolveDiff
(
"Business Template Configuration Diff"
,
expected_file
,
found
)
print
resolveDiff
(
"Business Template Configuration Diff"
,
expected_file
,
found
)
if
show_all
or
configuration
==
"order_builder"
:
if
show_all
or
configuration
==
"order_builder"
:
...
@@ -36,12 +41,38 @@ if show_all or configuration == "order_builder":
...
@@ -36,12 +41,38 @@ if show_all or configuration == "order_builder":
if
show_all
or
configuration
==
"property_sheet"
:
if
show_all
or
configuration
==
"property_sheet"
:
expected_file
=
portal
.
expected_property_sheet_dumped_configuration
expected_file
=
portal
.
expected_property_sheet_dumped_configuration
found
=
portal
.
ERP5Site_dumpPropertySheetList
()
found
=
portal
.
ERP5Site_dumpPropertySheetList
(
ignore_property_sheet_list
=
[
"Foo"
]
)
print
resolveDiff
(
"Property Sheet Configuration Diff"
,
expected_file
,
found
)
print
resolveDiff
(
"Property Sheet Configuration Diff"
,
expected_file
,
found
)
if
show_all
or
configuration
==
"skins"
:
if
show_all
or
configuration
==
"skins"
:
expected_file
=
portal
.
expected_portal_skins_dumped_configuration
expected_file
=
portal
.
expected_portal_skins_dumped_configuration
found
=
portal
.
ERP5Site_dumpPortalSkinsContent
()
found
=
portal
.
ERP5Site_dumpPortalSkinsContent
(
ignore_folder_list
=
[
"rapid_space"
,
"slapos_vifib"
,
"rapid_space_ui_test"
,
"slapos_ui_test"
,
"slapos_zh_ui_test"
,
"erp5_web_renderjs_ui_test_core"
],
ignore_skin_list
=
[
"expected_alarm_tool_dumped_configuration"
,
"expected_builder_dumped_configuration"
,
"expected_business_template_dumped_configuration"
,
"expected_order_builder_dumped_configuration"
,
"expected_portal_skins_dumped_configuration"
,
"expected_portal_type_dumped_configuration"
,
"expected_property_sheet_dumped_configuration"
,
"expected_role_dumped_configuration"
,
"expected_rule_dumped_configuration"
,
"expected_skin_property_dumped_configuration"
,
"expected_type_actions_dumped_configuration"
,
"expected_web_page_module_configuration"
,
"expected_workflow_dumped_configuration"
,
]
)
print
resolveDiff
(
"Skins Configuration Diff"
,
expected_file
,
found
)
print
resolveDiff
(
"Skins Configuration Diff"
,
expected_file
,
found
)
if
show_all
or
configuration
==
"web_content"
:
if
show_all
or
configuration
==
"web_content"
:
...
@@ -72,7 +103,16 @@ if show_all or configuration == "rule":
...
@@ -72,7 +103,16 @@ if show_all or configuration == "rule":
if
show_all
or
configuration
==
"skin_property"
:
if
show_all
or
configuration
==
"skin_property"
:
expected_file
=
portal
.
expected_skin_property_dumped_configuration
expected_file
=
portal
.
expected_skin_property_dumped_configuration
found
=
portal
.
ERP5Site_dumpSkinProperty
()
found
=
portal
.
ERP5Site_dumpSkinProperty
(
ignore_skin_folder_list
=
[
"rapid_space"
,
"slapos_vifib"
,
"rapid_space_ui_test"
,
"slapos_ui_test"
,
"slapos_zh_ui_test"
,
"erp5_web_renderjs_ui_test_core"
]
)
print
resolveDiff
(
"Skin Property Configuration Diff"
,
expected_file
,
found
)
print
resolveDiff
(
"Skin Property Configuration Diff"
,
expected_file
,
found
)
if
show_all
or
configuration
==
"workflow"
:
if
show_all
or
configuration
==
"workflow"
:
...
...
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_administration/expected_portal_skins_dumped_configuration.txt
View file @
f1bd3cfc
...
@@ -3715,19 +3715,6 @@ slapos_administration;SoftwareInstance_stopAsSelf;Script (Python);7740f5688e8d1f
...
@@ -3715,19 +3715,6 @@ slapos_administration;SoftwareInstance_stopAsSelf;Script (Python);7740f5688e8d1f
slapos_administration;TemplateTool_deleteObsoleteTemplateList;Script (Python);23dc4bcff4f1765a363142c0bbd4ad77
slapos_administration;TemplateTool_deleteObsoleteTemplateList;Script (Python);23dc4bcff4f1765a363142c0bbd4ad77
slapos_administration;TemplateTool_unindexDeletedObjectList;Script (Python);01e2fde673894240df826f838e0b217b
slapos_administration;TemplateTool_unindexDeletedObjectList;Script (Python);01e2fde673894240df826f838e0b217b
slapos_administration;WebPage_updateGadgetId;Script (Python);c53f438dabf6377b57bf9604de681a27
slapos_administration;WebPage_updateGadgetId;Script (Python);c53f438dabf6377b57bf9604de681a27
slapos_administration;expected_alarm_tool_dumped_configuration;File;f99767a50f1797fc6462d55878dbc952
slapos_administration;expected_builder_dumped_configuration;File;edcf0f7a0e489cb3401105579b0c6348
slapos_administration;expected_business_template_dumped_configuration;File;faa680fac9f0295083750c9b4b09decf
slapos_administration;expected_order_builder_dumped_configuration;File;213bab6f6b38274cb43752d5846a5ec2
slapos_administration;expected_portal_skins_dumped_configuration;File;61ac4c7d355d5951b1f54999cbfc09dc
slapos_administration;expected_portal_type_dumped_configuration;File;5cf38db325d0b711bac514e203dda50f
slapos_administration;expected_property_sheet_dumped_configuration;File;38792df575a4215c7a456f0118d82782
slapos_administration;expected_role_dumped_configuration;File;cace0f177546c1456556c6dd867c2bf1
slapos_administration;expected_rule_dumped_configuration;File;900e288b4992393cf495dee4c704f64d
slapos_administration;expected_skin_property_dumped_configuration;File;28fb4efcf460a725cf8b61bd30bcc4b5
slapos_administration;expected_type_actions_dumped_configuration;File;b584311be3d4ccbfc7c617e9161c26bc
slapos_administration;expected_web_page_module_configuration;File;a3c3abbaaf380523b803dff6fc331739
slapos_administration;expected_workflow_dumped_configuration;File;090a98978222e67b57d695f950a7bd83
slapos_administration;z_delete_security_uid_set_from_roles_and_users;Z SQL Method;75d4204a6fd83ac4153fa42a9f44a74a
slapos_administration;z_delete_security_uid_set_from_roles_and_users;Z SQL Method;75d4204a6fd83ac4153fa42a9f44a74a
slapos_administration;z_get_used_computer_security_uid_list;Z SQL Method;0b30e67d2b97d7ca2758cdbfdabbd4e1
slapos_administration;z_get_used_computer_security_uid_list;Z SQL Method;0b30e67d2b97d7ca2758cdbfdabbd4e1
slapos_administration;z_get_used_group_security_uid_list;Z SQL Method;0bec4e6abad0ba5a414e3ed3ab67437f
slapos_administration;z_get_used_group_security_uid_list;Z SQL Method;0bec4e6abad0ba5a414e3ed3ab67437f
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment