pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] UI blog tests

Browse Source 
bzr revid: ddm@openerp.com-20140107171841-ysj0qzb9g3hqbvad
This commit is contained in:
ddm@openerp.com
2014-01-07 18:18:41 +01:00
parent 8d26804796
commit 56e5fc3c05
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.tour.js
+1 -1
View File
@@ -291,7 +291,7 @@
var self = this;
var testId = 'test_'+tour.id+'_tour';
this.tours.push(tour);
var stepDelay = 100; //ms
var stepDelay = 500; //ms
var test = {
id: tour.id,
run: function (force) {
addons/website/tests/test_ui.py
+6 -10
View File
@@ -21,8 +21,7 @@ class LineReader:
def readlines(self):
data = os.read(self._file_descriptor, 4096)
if not data:
# EOF
if not data: # EOF
return None
self._buffer += data
if '\n' not in data:
@@ -57,7 +56,7 @@ class WebsiteUiSuite(unittest.TestSuite):
except OSError:
test = WebsiteUiTest('UI Tests')
result.startTest(test)
result.addSkip(test, "phantomjs command not found")
result.addSkip(test, "phantomjs command not found (cf. http://phantomjs.org/)")
result.stopTest(test)
return
# ...then run the actual test
@@ -97,7 +96,7 @@ class WebsiteUiSuite(unittest.TestSuite):
for stream in ready:
lines = stream.readlines()
if lines is None: # EOF
# Fixes an issue with PhantomJS 1.9.2 on OS X Mavericks
# Fixes an issue with PhantomJS 1.9.2 on OS X 10.9 (Mavericks)
# cf. https://github.com/ariya/phantomjs/issues/11418
filtered_lines = [line for line in output if "CoreText performance note" not in line]
if (filtered_lines):
@@ -129,14 +128,11 @@ class WebsiteUiSuite(unittest.TestSuite):
if event == 'success':
result.addSuccess(self._test)
elif event == 'error':
message = args.get('message', "")
result.addError(self._test, message+"\n"+"\n".join(lines[1::]))
result.addError(self._test, args.get('message', "")+"\n"+"\n".join(lines[1::]))
else:
message = "\n".join(lines)
result.addError(self._test, 'Unexpected message: "%s"' % message)
result.addError(self._test, 'Unexpected message: "%s"' % "\n".join(lines))
except ValueError:
message = "\n".join(lines)
result.addError(self._test, 'Unexpected message: "%s"' % message)
result.addError(self._test, 'Unexpected message: "%s"' % "\n".join(lines))
def full_path(filename):
return os.path.join(os.path.join(os.path.dirname(__file__), 'ui_suite'), filename)
addons/website_blog/tests/ui_suite/post_test.js
+5 -8
View File
@@ -2,24 +2,21 @@ var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
var waitFor = testRunner.waitFor;
testRunner.run(function homepageTest (page) {
testRunner.run(function homepageTest (page, timeout) {
page.evaluate(function () { localStorage.clear(); });
waitFor(function clientReady () {
return page.evaluate(function () {
return window.openerp && window.openerp.website
return window.$ && window.openerp && window.openerp.website
&& window.openerp.website.TestConsole
&& window.openerp.website.TestConsole.test('blog');
});
}, function executeTest () {
page.onResourceError = function(error) {
console.log('{ "event": "error", "message": "'+error.url+' failed to load ('+error.errorString+') "}');
};
page.evaluate(function () {
window.openerp.website.TestConsole.test('blog').run(true);
});
waitFor(function testExecuted () {
var after = page.evaluate(function () {
return $('button[data-action=edit]').is(":visible") && {
return window.$ && $('button[data-action=edit]').is(":visible") && {
image: $('#wrap [data-snippet-id=image-text]').length,
text: $('#wrap [data-snippet-id=text-block]').length,
};
@@ -32,6 +29,6 @@ testRunner.run(function homepageTest (page) {
}, function finish () {
console.log('{ "event": "success" }');
phantom.exit();
}, 90000);
}, 20000);
}, 4*timeout/5);
}, timeout/5);
});