From 363d0c0e77e98d9c659ec29207e3fbeee566ad56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 20 Oct 2011 14:01:14 +0200
Subject: [PATCH] Start creating standalone test runner recipe for revelant
part.
---
setup.py | 1 +
slapos/recipe/erp5/test_suite_runner.py | 23 --------
slapos/recipe/erp5/testrunner.py | 23 --------
slapos/recipe/erp5_test/__init__.py | 31 +++++++++++
slapos/recipe/erp5_test/test.py | 72 +++++++++++++++++++++++++
5 files changed, 104 insertions(+), 46 deletions(-)
delete mode 100644 slapos/recipe/erp5/test_suite_runner.py
delete mode 100644 slapos/recipe/erp5/testrunner.py
create mode 100644 slapos/recipe/erp5_test/__init__.py
create mode 100644 slapos/recipe/erp5_test/test.py
diff --git a/setup.py b/setup.py
index ffc18a56c..1cae88e40 100644
--- a/setup.py
+++ b/setup.py
@@ -92,5 +92,6 @@ setup(name=name,
'zeo = slapos.recipe.zeo:Recipe',
'tidstorage = slapos.recipe.tidstorage:Recipe',
'erp5.update = slapos.recipe.erp5_update:Recipe'
+ 'erp5.test = slapos.recipe.erp5_test:Recipe',
]},
)
diff --git a/slapos/recipe/erp5/test_suite_runner.py b/slapos/recipe/erp5/test_suite_runner.py
deleted file mode 100644
index f58d6ad47..000000000
--- a/slapos/recipe/erp5/test_suite_runner.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import os
-import sys
-def runTestSuite(args):
- env = os.environ.copy()
- d = args[0]
- env['OPENSSL_BINARY'] = d['openssl_binary']
- env['TEST_CA_PATH'] = d['test_ca_path']
- env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
- env['INSTANCE_HOME'] = d['instance_home']
- env['REAL_INSTANCE_HOME'] = d['instance_home']
- # 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)
diff --git a/slapos/recipe/erp5/testrunner.py b/slapos/recipe/erp5/testrunner.py
deleted file mode 100644
index 5aa09c11b..000000000
--- a/slapos/recipe/erp5/testrunner.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import os
-import sys
-def runUnitTest(args):
- env = os.environ.copy()
- d = args[0]
- env['OPENSSL_BINARY'] = d['openssl_binary']
- env['TEST_CA_PATH'] = d['test_ca_path']
- env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
- env['INSTANCE_HOME'] = d['instance_home']
- env['REAL_INSTANCE_HOME'] = d['instance_home']
- # 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)
diff --git a/slapos/recipe/erp5_test/__init__.py b/slapos/recipe/erp5_test/__init__.py
new file mode 100644
index 000000000..94db78358
--- /dev/null
+++ b/slapos/recipe/erp5_test/__init__.py
@@ -0,0 +1,31 @@
+##############################################################################
+#
+# 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
+
+class Recipe(GenericBaseRecipe):
+ def install(self):
+ pass
diff --git a/slapos/recipe/erp5_test/test.py b/slapos/recipe/erp5_test/test.py
new file mode 100644
index 000000000..dd05f96b2
--- /dev/null
+++ b/slapos/recipe/erp5_test/test.py
@@ -0,0 +1,72 @@
+##############################################################################
+#
+# 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['OPENSSL_BINARY'] = d['openssl_binary']
+ env['TEST_CA_PATH'] = d['test_ca_path']
+ env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
+ env['INSTANCE_HOME'] = d['instance_home']
+ env['REAL_INSTANCE_HOME'] = d['instance_home']
+ # 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['OPENSSL_BINARY'] = d['openssl_binary']
+ env['TEST_CA_PATH'] = d['test_ca_path']
+ env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
+ env['INSTANCE_HOME'] = d['instance_home']
+ env['REAL_INSTANCE_HOME'] = d['instance_home']
+ # 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)
+
--
2.30.9