3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1d43f611d5a9/ Changeset: 1d43f611d5a9 Branch: next-stable User: jmchilton Date: 2014-11-26 04:02:05+00:00 Summary: Skip galaxy.tools.watcher test if watchdog unavailable. Instead of failing. Affected #: 1 file diff -r c16fea918b33fd4e1ec52c3b5c38981d9c88cfa0 -r 1d43f611d5a98003c7d3b488bdb6a3ba9e982d8a test/unit/tools/test_watcher.py --- a/test/unit/tools/test_watcher.py +++ b/test/unit/tools/test_watcher.py @@ -9,6 +9,10 @@ def test_watcher(): + if not watcher.can_watch: + from nose.plugins.skip import SkipTest + raise SkipTest() + with __test_directory() as t: tool_path = path.join(t, "test.xml") toolbox = Toolbox() https://bitbucket.org/galaxy/galaxy-central/commits/9925a5adf6c4/ Changeset: 9925a5adf6c4 Branch: next-stable User: jmchilton Date: 2014-11-26 04:02:05+00:00 Summary: Attempt fix of test/unit/test_lazy_process.py which transiently fails. Affected #: 1 file diff -r 1d43f611d5a98003c7d3b488bdb6a3ba9e982d8a -r 9925a5adf6c4b65d3242d99bc16138839ad7ef21 test/unit/test_lazy_process.py --- a/test/unit/test_lazy_process.py +++ b/test/unit/test_lazy_process.py @@ -11,9 +11,8 @@ lazy_process = LazyProcess(["bash", "-c", "touch %s; sleep 100" % t.name]) assert not os.path.exists(t.name) lazy_process.start_process() - time.sleep(.02) + while not os.path.exists(t.name): + time.sleep(.01) assert lazy_process.process.poll() is None - assert os.path.exists(t.name) lazy_process.shutdown() - time.sleep(.02) assert lazy_process.process.poll() https://bitbucket.org/galaxy/galaxy-central/commits/bf6fe8748b4d/ Changeset: bf6fe8748b4d User: jmchilton Date: 2014-11-26 04:03:03+00:00 Summary: Merge next-stable. Affected #: 2 files diff -r 30132ca365effac14fe5fd419ed39d20b83fcbc6 -r bf6fe8748b4d6f9096e9aa11f5abe7abcd372e27 test/unit/test_lazy_process.py --- a/test/unit/test_lazy_process.py +++ b/test/unit/test_lazy_process.py @@ -11,9 +11,8 @@ lazy_process = LazyProcess(["bash", "-c", "touch %s; sleep 100" % t.name]) assert not os.path.exists(t.name) lazy_process.start_process() - time.sleep(.02) + while not os.path.exists(t.name): + time.sleep(.01) assert lazy_process.process.poll() is None - assert os.path.exists(t.name) lazy_process.shutdown() - time.sleep(.02) assert lazy_process.process.poll() diff -r 30132ca365effac14fe5fd419ed39d20b83fcbc6 -r bf6fe8748b4d6f9096e9aa11f5abe7abcd372e27 test/unit/tools/test_watcher.py --- a/test/unit/tools/test_watcher.py +++ b/test/unit/tools/test_watcher.py @@ -9,6 +9,10 @@ def test_watcher(): + if not watcher.can_watch: + from nose.plugins.skip import SkipTest + raise SkipTest() + with __test_directory() as t: tool_path = path.join(t, "test.xml") toolbox = Toolbox() Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.