summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2014-02-09 15:19:50 +0100
committerAntony Lesuisse <al@openerp.com>2014-02-09 15:19:50 +0100
commit70d498c14a2942e87bc4c96b6d37a3dff6e71954 (patch)
treeba4e7b5c8b2469d7bc5b7988336ac2ef5bd176d8
parent16fd821ed67e1a2e2ba092285a07229326ead705 (diff)
[FIX] disable http test before conversion
bzr revid: al@openerp.com-20140209141950-o9sf0jual07y315f
-rw-r--r--addons/website/tests/__init__.py7
-rw-r--r--addons/website/tests/cases.py35
-rw-r--r--addons/website/tests/test_requests.py38
-rw-r--r--addons/website/tests/test_ui_dom.js (renamed from addons/website/tests/ui_suite/simple_dom_test.js)0
-rw-r--r--addons/website/tests/test_ui_homepage.js (renamed from addons/website/tests/ui_suite/homepage_test.js)0
-rw-r--r--addons/website/tests/test_ui_login.js (renamed from addons/website/tests/ui_suite/login_test.js)0
-rw-r--r--addons/website/tests/test_ui_runner.js (renamed from addons/website/tests/ui_suite/ui_test_runner.js)0
-rw-r--r--addons/website/tests/ui_suite/dummy_test.js4
-rw-r--r--addons/website_blog/tests/__init__.py2
-rw-r--r--addons/website_blog/tests/test_ui_post.js (renamed from addons/website_blog/tests/ui_suite/post_test.js)0
-rw-r--r--addons/website_event/tests/__init__.py7
-rw-r--r--addons/website_event/tests/test_controllers.py29
-rw-r--r--addons/website_event/tests/test_ui_event.js (renamed from addons/website_event/tests/ui_suite/event_test.js)0
-rw-r--r--addons/website_event_sale/tests/__init__.py2
-rw-r--r--addons/website_event_sale/tests/test_ui_event_sale.js (renamed from addons/website_event_sale/tests/ui_suite/website_event_sale_test.js)0
-rw-r--r--addons/website_sale/tests/__init__.py2
-rw-r--r--addons/website_sale/tests/test_ui_add_product.js (renamed from addons/website_sale/tests/ui_suite/website_sale-add_product-test.js)0
-rw-r--r--addons/website_sale/tests/test_ui_checkout.js (renamed from addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js)0
18 files changed, 42 insertions, 84 deletions
diff --git a/addons/website/tests/__init__.py b/addons/website/tests/__init__.py
index 665bbc9f535..e8c23ffd78d 100644
--- a/addons/website/tests/__init__.py
+++ b/addons/website/tests/__init__.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
-import test_views, test_converter, test_requests, test_ui
-
-checks = [ test_views, test_converter, ]
+import test_converter
+#import test_requests
+#import test_ui
+import test_views
diff --git a/addons/website/tests/cases.py b/addons/website/tests/cases.py
deleted file mode 100644
index 3e777293ff9..00000000000
--- a/addons/website/tests/cases.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-import unittest2
-
-class URLCase(unittest2.TestCase):
- """
- URLCase moved out of test_requests, otherwise discovery attempts to
- instantiate and run it
- """
- def __init__(self, user, url, source, result):
- super(URLCase, self).__init__()
- self.user = user
- self.url = url
- self.source = source
- self.result = result
-
- @property
- def username(self):
- return self.user or "Anonymous Coward"
-
- def __str__(self):
- if self.source:
- return "%s (from %s, as %s)" % (self.url, self.source, self.username)
- return "%s (as %s)" % (self.url, self.username)
-
- __repr__ = __str__
-
- def shortDescription(self):
- return ""
-
- def runTest(self):
- code = self.result.getcode()
- self.assertIn(
- code, xrange(200, 300),
- "Fetching %s as %s returned an error response (%d)" % (
- self.url, self.username, code))
diff --git a/addons/website/tests/test_requests.py b/addons/website/tests/test_requests.py
index ecdb8d99d7d..391eee57d0a 100644
--- a/addons/website/tests/test_requests.py
+++ b/addons/website/tests/test_requests.py
@@ -9,10 +9,41 @@ import lxml.html
from openerp import tools
-from . import cases
-
__all__ = ['load_tests', 'CrawlSuite']
+class URLCase(unittest2.TestCase):
+ """
+ URLCase moved out of test_requests, otherwise discovery attempts to
+ instantiate and run it
+ """
+ def __init__(self, user, url, source, result):
+ super(URLCase, self).__init__()
+ self.user = user
+ self.url = url
+ self.source = source
+ self.result = result
+
+ @property
+ def username(self):
+ return self.user or "Anonymous Coward"
+
+ def __str__(self):
+ if self.source:
+ return "%s (from %s, as %s)" % (self.url, self.source, self.username)
+ return "%s (as %s)" % (self.url, self.username)
+
+ __repr__ = __str__
+
+ def shortDescription(self):
+ return ""
+
+ def runTest(self):
+ code = self.result.getcode()
+ self.assertIn(
+ code, xrange(200, 300),
+ "Fetching %s as %s returned an error response (%d)" % (
+ self.url, self.username, code))
+
class RedirectHandler(urllib2.HTTPRedirectHandler):
"""
HTTPRedirectHandler is predicated upon HTTPErrorProcessor being used and
@@ -118,11 +149,10 @@ class URL(object):
self.source = source
def to_case(self, user, result):
- return cases.URLCase(user, self.url, self.source, result)
+ return URLCase(user, self.url, self.source, result)
def load_tests(loader, base, _):
base.addTest(CrawlSuite())
- # blog duplicate (&al?) are on links
base.addTest(CrawlSuite('admin', tools.config['admin_passwd']))
base.addTest(CrawlSuite('demo', 'demo'))
return base
diff --git a/addons/website/tests/ui_suite/simple_dom_test.js b/addons/website/tests/test_ui_dom.js
index 5fe5240c1de..5fe5240c1de 100644
--- a/addons/website/tests/ui_suite/simple_dom_test.js
+++ b/addons/website/tests/test_ui_dom.js
diff --git a/addons/website/tests/ui_suite/homepage_test.js b/addons/website/tests/test_ui_homepage.js
index 9c7375589a6..9c7375589a6 100644
--- a/addons/website/tests/ui_suite/homepage_test.js
+++ b/addons/website/tests/test_ui_homepage.js
diff --git a/addons/website/tests/ui_suite/login_test.js b/addons/website/tests/test_ui_login.js
index 3ac403e586d..3ac403e586d 100644
--- a/addons/website/tests/ui_suite/login_test.js
+++ b/addons/website/tests/test_ui_login.js
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/test_ui_runner.js
index 745adc15f0c..745adc15f0c 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/test_ui_runner.js
diff --git a/addons/website/tests/ui_suite/dummy_test.js b/addons/website/tests/ui_suite/dummy_test.js
deleted file mode 100644
index 7646e4ec76a..00000000000
--- a/addons/website/tests/ui_suite/dummy_test.js
+++ /dev/null
@@ -1,4 +0,0 @@
-console.log('{ "event": "success" }');
-// For a failure:
-// console.log('{ "event": "failure", "message": "The test failed" }');
-phantom.exit(); \ No newline at end of file
diff --git a/addons/website_blog/tests/__init__.py b/addons/website_blog/tests/__init__.py
index 157f4549988..3dcbf31d714 100644
--- a/addons/website_blog/tests/__init__.py
+++ b/addons/website_blog/tests/__init__.py
@@ -19,6 +19,6 @@
#
##############################################################################
-import test_ui
+#import test_ui
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_blog/tests/ui_suite/post_test.js b/addons/website_blog/tests/test_ui_post.js
index 1152ab1da55..1152ab1da55 100644
--- a/addons/website_blog/tests/ui_suite/post_test.js
+++ b/addons/website_blog/tests/test_ui_post.js
diff --git a/addons/website_event/tests/__init__.py b/addons/website_event/tests/__init__.py
index 5e7b52ddf04..74c7e741aaf 100644
--- a/addons/website_event/tests/__init__.py
+++ b/addons/website_event/tests/__init__.py
@@ -20,11 +20,6 @@
##############################################################################
import test_controllers
-
-import test_ui
-
-checks = [
- test_controllers,
-]
+#import test_ui
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_event/tests/test_controllers.py b/addons/website_event/tests/test_controllers.py
deleted file mode 100644
index 33b37aede9d..00000000000
--- a/addons/website_event/tests/test_controllers.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.addons.mail.tests.common import TestMail
-from openerp.tools import mute_logger, email_split
-
-
-class TestControllers(TestMail):
-
- def test_00(self):
- cr, uid = self.cr, self.uid
diff --git a/addons/website_event/tests/ui_suite/event_test.js b/addons/website_event/tests/test_ui_event.js
index 946427b6b6d..946427b6b6d 100644
--- a/addons/website_event/tests/ui_suite/event_test.js
+++ b/addons/website_event/tests/test_ui_event.js
diff --git a/addons/website_event_sale/tests/__init__.py b/addons/website_event_sale/tests/__init__.py
index bf8ba6321ad..c9d4e3399ba 100644
--- a/addons/website_event_sale/tests/__init__.py
+++ b/addons/website_event_sale/tests/__init__.py
@@ -1 +1 @@
-import test_ui
+#import test_ui
diff --git a/addons/website_event_sale/tests/ui_suite/website_event_sale_test.js b/addons/website_event_sale/tests/test_ui_event_sale.js
index 6662c6a2a55..6662c6a2a55 100644
--- a/addons/website_event_sale/tests/ui_suite/website_event_sale_test.js
+++ b/addons/website_event_sale/tests/test_ui_event_sale.js
diff --git a/addons/website_sale/tests/__init__.py b/addons/website_sale/tests/__init__.py
index bf8ba6321ad..c9d4e3399ba 100644
--- a/addons/website_sale/tests/__init__.py
+++ b/addons/website_sale/tests/__init__.py
@@ -1 +1 @@
-import test_ui
+#import test_ui
diff --git a/addons/website_sale/tests/ui_suite/website_sale-add_product-test.js b/addons/website_sale/tests/test_ui_add_product.js
index 24befb7f15d..24befb7f15d 100644
--- a/addons/website_sale/tests/ui_suite/website_sale-add_product-test.js
+++ b/addons/website_sale/tests/test_ui_add_product.js
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/test_ui_checkout.js
index ca3943d5e85..ca3943d5e85 100644
--- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
+++ b/addons/website_sale/tests/test_ui_checkout.js