From 385a660a1868dc1777b251dfcf83371ccd388b02 Mon Sep 17 00:00:00 2001 From: Fraser Adams Date: Thu, 2 Jan 2014 16:40:09 +0000 Subject: Added crypto quality random number generators for Node.js and browser environment if available --- tests/test_browser.py | 20 ++++++++++++++++++++ tests/test_other.py | 11 ----------- tests/uuid/test.c | 12 ++++++++++-- 3 files changed, 30 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/test_browser.py b/tests/test_browser.py index 920c6f8c..3d344c14 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -1717,3 +1717,23 @@ keydown(100);keyup(100); // trigger the end assert 'argv[3]: 3' in stdout assert 'hello, world!' in stdout assert 'hello, error stream!' in stderr + + def test_uuid(self): + # Run with ./runner.py browser.test_uuid + # We run this test in Node/SPIDERMONKEY and browser environments because we try to make use of + # high quality crypto random number generators such as crypto.getRandomValues or randomBytes (if available). + + # First run tests in Node and/or SPIDERMONKEY using run_js + Popen([PYTHON, EMCC, path_from_root('tests', 'uuid', 'test.c'), '-o', path_from_root('tests', 'uuid', 'test.js')], stdout=PIPE, stderr=PIPE).communicate() + + out = run_js(path_from_root('tests', 'uuid', 'test.js'), full_output=True) + print out + + # Tidy up files that might have been created by this test. + try_delete(path_from_root('tests', 'uuid', 'test.js')) + try_delete(path_from_root('tests', 'uuid', 'test.js.map')) + + # Now run test in browser + self.btest(path_from_root('tests', 'uuid', 'test.c'), '1') + + diff --git a/tests/test_other.py b/tests/test_other.py index f229fef1..c75362af 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -2197,14 +2197,3 @@ mergeInto(LibraryManager.library, { process.communicate() assert(os.path.isfile(outdir + 'hello_world.obj')) - def test_uuid(self): - # Run with ./runner.py other.test_uuid - Popen([PYTHON, EMCC, path_from_root('tests', 'uuid', 'test.c'), '-o', path_from_root('tests', 'uuid', 'test.js')], stdout=PIPE, stderr=PIPE).communicate() - - out = run_js(path_from_root('tests', 'uuid', 'test.js'), full_output=True) - print out - - # Tidy up files that might have been created by this test. - try_delete(path_from_root('tests', 'uuid', 'test.js')) - try_delete(path_from_root('tests', 'uuid', 'test.js.map')) - diff --git a/tests/uuid/test.c b/tests/uuid/test.c index ea3b116c..dc2c6589 100644 --- a/tests/uuid/test.c +++ b/tests/uuid/test.c @@ -1,8 +1,9 @@ - #include #include +#include #include #include +#include int isUUID(char* p, int upper) { char* p1 = p; @@ -56,6 +57,13 @@ int main() { assert(uuid_is_null(uuid) == 1); - return 0; + // The following lets the browser test exit cleanly. + int result = 1; + #if EMSCRIPTEN + #ifdef REPORT_RESULT + REPORT_RESULT(); + #endif + #endif + exit(0); } -- cgit v1.2.3-18-g5258