You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2019/10/14 21:00:06 UTC
[allura] 01/09: [#8336] Make tests pass on OSX
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8336
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 32cdadd4c800cb8557fb920cacff386c5990c649
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Thu Oct 10 14:53:41 2019 -0400
[#8336] Make tests pass on OSX
---
Allura/allura/tests/unit/test_ldap_auth_provider.py | 5 +++++
AlluraTest/setup.cfg | 13 +++++++++++++
2 files changed, 18 insertions(+)
diff --git a/Allura/allura/tests/unit/test_ldap_auth_provider.py b/Allura/allura/tests/unit/test_ldap_auth_provider.py
index 298cd39..c131be4 100644
--- a/Allura/allura/tests/unit/test_ldap_auth_provider.py
+++ b/Allura/allura/tests/unit/test_ldap_auth_provider.py
@@ -18,10 +18,13 @@
# under the License.
import calendar
+import platform
from datetime import datetime, timedelta
+
from bson import ObjectId
from mock import patch, Mock
from nose.tools import assert_equal, assert_not_equal, assert_true
+from nose import SkipTest
from webob import Request
from ming.orm.ormsession import ThreadLocalORMSession
from tg import config
@@ -42,6 +45,8 @@ class TestLdapAuthenticationProvider(object):
# Verify salt
ep = self.provider._encode_password
# Note: OSX uses a crypt library with a known issue relating the hashing algorithms.
+ if '$6$rounds=' not in ep('pwd') and platform.system() == 'Darwin':
+ raise SkipTest
assert_not_equal(ep('test_pass'), ep('test_pass'))
assert_equal(ep('test_pass', '0000'), ep('test_pass', '0000'))
# Test password format
diff --git a/AlluraTest/setup.cfg b/AlluraTest/setup.cfg
new file mode 100644
index 0000000..0f1091a
--- /dev/null
+++ b/AlluraTest/setup.cfg
@@ -0,0 +1,13 @@
+[pep8]
+max-line-length = 119
+
+[flake8]
+max-line-length = 119
+
+[egg_info]
+tag_build = dev0
+
+[coverage:run]
+parallel=true
+concurrency=multiprocessing
+source=../Allura/allura,forgeblog
\ No newline at end of file