Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos
Commits
516022e5
Commit
516022e5
authored
Aug 22, 2012
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop part of code duplication between cloudooo.test and erp5.test
parent
f265c427
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
126 deletions
+46
-126
setup.py
setup.py
+1
-1
slapos/recipe/cloudooo_test/__init__.py
slapos/recipe/cloudooo_test/__init__.py
+0
-51
slapos/recipe/cloudooo_test/test.py
slapos/recipe/cloudooo_test/test.py
+0
-64
slapos/recipe/erp5_test/__init__.py
slapos/recipe/erp5_test/__init__.py
+26
-0
slapos/recipe/erp5_test/test.py
slapos/recipe/erp5_test/test.py
+19
-10
No files found.
setup.py
View file @
516022e5
...
@@ -66,7 +66,7 @@ setup(name=name,
...
@@ -66,7 +66,7 @@ setup(name=name,
'onetimeupload = slapos.recipe.onetimeupload:Recipe'
,
'onetimeupload = slapos.recipe.onetimeupload:Recipe'
,
'helloworld = slapos.recipe.helloworld:Recipe'
,
'helloworld = slapos.recipe.helloworld:Recipe'
,
'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe'
,
'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe'
,
'cloudooo.test = slapos.recipe.
cloudooo_test:
Recipe'
,
'cloudooo.test = slapos.recipe.
erp5_test:Cloudooo
Recipe'
,
'firefox = slapos.recipe.firefox:Recipe'
,
'firefox = slapos.recipe.firefox:Recipe'
,
'fontconfig = slapos.recipe.fontconfig:Recipe'
,
'fontconfig = slapos.recipe.fontconfig:Recipe'
,
'java = slapos.recipe.java:Recipe'
,
'java = slapos.recipe.java:Recipe'
,
...
...
slapos/recipe/cloudooo_test/__init__.py
deleted
100644 → 0
View file @
f265c427
##############################################################################
#
# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
from
slapos.recipe.librecipe
import
GenericBaseRecipe
import
urlparse
class
Recipe
(
GenericBaseRecipe
):
def
install
(
self
):
path_list
=
[]
common_dict
=
dict
(
prepend_path
=
self
.
options
[
'prepend-path'
],
)
common_list
=
[
"--paster_path"
,
self
.
options
[
'ooo-paster'
],
self
.
options
[
'configuration-file'
]
]
run_unit_test_path
=
self
.
createPythonScript
(
self
.
options
[
'run-unit-test'
],
__name__
+
'.test.runUnitTest'
,
[
dict
(
call_list
=
[
self
.
options
[
'run-unit-test-binary'
],
]
+
common_list
,
**
common_dict
)])
path_list
.
append
(
run_unit_test_path
)
path_list
.
append
(
self
.
createPythonScript
(
self
.
options
[
'run-test-suite'
],
__name__
+
'.test.runTestSuite'
,
[
dict
(
call_list
=
[
self
.
options
[
'run-test-suite-binary'
],
],
**
common_dict
)]))
return
path_list
slapos/recipe/cloudooo_test/test.py
deleted
100644 → 0
View file @
f265c427
##############################################################################
#
# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import
os
import
sys
def
runTestSuite
(
args
):
env
=
os
.
environ
.
copy
()
d
=
args
[
0
]
env
[
'PATH'
]
=
':'
.
join
([
d
[
'prepend_path'
]]
+
os
.
environ
[
'PATH'
].
split
(
':'
))
# Deal with Shebang size limitation
executable_filepath
=
d
[
'call_list'
][
0
]
file_object
=
open
(
executable_filepath
,
'r'
)
line
=
file_object
.
readline
()
file_object
.
close
()
argument_list
=
[]
if
line
[:
2
]
==
'#!'
:
executable_filepath
=
line
[
2
:].
strip
()
argument_list
.
append
(
executable_filepath
)
argument_list
.
extend
(
d
[
'call_list'
])
argument_list
.
extend
(
sys
.
argv
[
1
:])
argument_list
.
append
(
env
)
os
.
execle
(
executable_filepath
,
*
argument_list
)
def
runUnitTest
(
args
):
env
=
os
.
environ
.
copy
()
d
=
args
[
0
]
env
[
'PATH'
]
=
':'
.
join
([
d
[
'prepend_path'
]]
+
os
.
environ
.
get
(
'PATH'
,
''
).
split
(
':'
))
# Deal with Shebang size limitation
executable_filepath
=
d
[
'call_list'
][
0
]
file_object
=
open
(
executable_filepath
,
'r'
)
line
=
file_object
.
readline
()
file_object
.
close
()
argument_list
=
[]
if
line
[:
2
]
==
'#!'
:
executable_filepath
=
line
[
2
:].
strip
()
argument_list
.
append
(
executable_filepath
)
argument_list
.
extend
(
d
[
'call_list'
])
argument_list
.
extend
(
sys
.
argv
[
1
:])
argument_list
.
append
(
env
)
os
.
execle
(
executable_filepath
,
*
argument_list
)
slapos/recipe/erp5_test/__init__.py
View file @
516022e5
...
@@ -27,6 +27,9 @@
...
@@ -27,6 +27,9 @@
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
import
urlparse
import
urlparse
# The follow recipes should be unified somehow in order to improve
# code mantainence.
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
def
install
(
self
):
def
install
(
self
):
testinstance
=
self
.
options
[
'test-instance-path'
]
testinstance
=
self
.
options
[
'test-instance-path'
]
...
@@ -72,3 +75,26 @@ class Recipe(GenericBaseRecipe):
...
@@ -72,3 +75,26 @@ class Recipe(GenericBaseRecipe):
]
+
common_list
,
**
common_dict
)]))
]
+
common_list
,
**
common_dict
)]))
return
path_list
return
path_list
class
CloudoooRecipe
(
GenericBaseRecipe
):
def
install
(
self
):
path_list
=
[]
common_dict
=
dict
(
prepend_path
=
self
.
options
[
'prepend-path'
],
)
common_list
=
[
"--paster_path"
,
self
.
options
[
'ooo-paster'
],
self
.
options
[
'configuration-file'
]
]
run_unit_test_path
=
self
.
createPythonScript
(
self
.
options
[
'run-unit-test'
],
__name__
+
'.test.runUnitTest'
,
[
dict
(
call_list
=
[
self
.
options
[
'run-unit-test-binary'
],
]
+
common_list
,
**
common_dict
)])
path_list
.
append
(
run_unit_test_path
)
path_list
.
append
(
self
.
createPythonScript
(
self
.
options
[
'run-test-suite'
],
__name__
+
'.test.runTestSuite'
,
[
dict
(
call_list
=
[
self
.
options
[
'run-test-suite-binary'
],
],
**
common_dict
)]))
return
path_list
slapos/recipe/erp5_test/test.py
View file @
516022e5
...
@@ -29,11 +29,16 @@ import sys
...
@@ -29,11 +29,16 @@ import sys
def
runTestSuite
(
args
):
def
runTestSuite
(
args
):
env
=
os
.
environ
.
copy
()
env
=
os
.
environ
.
copy
()
d
=
args
[
0
]
d
=
args
[
0
]
if
'openssl_binary'
in
d
:
env
[
'OPENSSL_BINARY'
]
=
d
[
'openssl_binary'
]
env
[
'OPENSSL_BINARY'
]
=
d
[
'openssl_binary'
]
if
'test_ca_path'
in
d
:
env
[
'TEST_CA_PATH'
]
=
d
[
'test_ca_path'
]
env
[
'TEST_CA_PATH'
]
=
d
[
'test_ca_path'
]
env
[
'PATH'
]
=
':'
.
join
([
d
[
'prepend_path'
]]
+
os
.
environ
[
'PATH'
].
split
(
':'
))
if
'prepend_path'
in
d
:
env
[
'PATH'
]
=
':'
.
join
([
d
[
'prepend_path'
]]
+
os
.
environ
.
get
(
'PATH'
,
''
).
split
(
':'
))
if
'instance_home'
in
d
:
env
[
'INSTANCE_HOME'
]
=
d
[
'instance_home'
]
env
[
'INSTANCE_HOME'
]
=
d
[
'instance_home'
]
env
[
'REAL_INSTANCE_HOME'
]
=
d
[
'instance_home'
]
env
[
'REAL_INSTANCE_HOME'
]
=
d
[
'instance_home'
]
# Deal with Shebang size limitation
# Deal with Shebang size limitation
executable_filepath
=
d
[
'call_list'
][
0
]
executable_filepath
=
d
[
'call_list'
][
0
]
file_object
=
open
(
executable_filepath
,
'r'
)
file_object
=
open
(
executable_filepath
,
'r'
)
...
@@ -51,9 +56,13 @@ def runTestSuite(args):
...
@@ -51,9 +56,13 @@ def runTestSuite(args):
def
runUnitTest
(
args
):
def
runUnitTest
(
args
):
env
=
os
.
environ
.
copy
()
env
=
os
.
environ
.
copy
()
d
=
args
[
0
]
d
=
args
[
0
]
if
'openssl_binary'
in
d
:
env
[
'OPENSSL_BINARY'
]
=
d
[
'openssl_binary'
]
env
[
'OPENSSL_BINARY'
]
=
d
[
'openssl_binary'
]
if
'test_ca_path'
in
d
:
env
[
'TEST_CA_PATH'
]
=
d
[
'test_ca_path'
]
env
[
'TEST_CA_PATH'
]
=
d
[
'test_ca_path'
]
if
'prepend_path'
in
d
:
env
[
'PATH'
]
=
':'
.
join
([
d
[
'prepend_path'
]]
+
os
.
environ
.
get
(
'PATH'
,
''
).
split
(
':'
))
env
[
'PATH'
]
=
':'
.
join
([
d
[
'prepend_path'
]]
+
os
.
environ
.
get
(
'PATH'
,
''
).
split
(
':'
))
if
'instance_home'
in
d
:
env
[
'INSTANCE_HOME'
]
=
d
[
'instance_home'
]
env
[
'INSTANCE_HOME'
]
=
d
[
'instance_home'
]
env
[
'REAL_INSTANCE_HOME'
]
=
d
[
'instance_home'
]
env
[
'REAL_INSTANCE_HOME'
]
=
d
[
'instance_home'
]
# Deal with Shebang size limitation
# Deal with Shebang size limitation
...
...
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