allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject allura git commit: Fix test that was failing due to timings
Date Mon, 05 Dec 2016 18:17:35 GMT
Repository: allura
Updated Branches:
  refs/heads/master 3b8240fc2 -> 04f37652f


Fix test that was failing due to timings


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/04f37652
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/04f37652
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/04f37652

Branch: refs/heads/master
Commit: 04f37652f5701f6b9c1143f77f6097d7b7ce000f
Parents: 3b8240f
Author: Dave Brondsema <dave@brondsema.net>
Authored: Mon Dec 5 13:17:25 2016 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Mon Dec 5 13:17:25 2016 -0500

----------------------------------------------------------------------
 Allura/allura/tests/test_globals.py | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/04f37652/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index def99a0..3c83a78 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -183,6 +183,7 @@ def test_macro_neighborhood_feeds():
     with h.push_context('--init--', 'wiki', neighborhood='Projects'):
         r = g.markdown_wiki.convert('[[neighborhood_feeds tool_name=wiki]]')
         assert 'Home modified by' in r, r
+        r = re.sub(r'<small>.*? ago</small>', '', r)  # remove "less than 1 second
ago" etc
         orig_len = len(r)
         # Make project private & verify we don't see its new feed items
         anon = M.User.anonymous()
@@ -194,6 +195,7 @@ def test_macro_neighborhood_feeds():
         with h.push_config(c, user=M.User.by_username('test-admin')):
             pg.commit()
         r = g.markdown_wiki.convert('[[neighborhood_feeds tool_name=wiki]]')
+        r = re.sub(r'<small>.*? ago</small>', '', r)  # remove "less than 1 second
ago" etc
         new_len = len(r)
         assert new_len == orig_len
         p = BM.BlogPost(title='test me',


Mime
View raw message