Friday 24th December 2010
Fedora Project
Updated proftpd in Rawhide to 1.3.4rc1 as per yesterday's local update
Local Packages
Updated the proftpd test suite patch in svn to fix intermittent fails in the timer tests:
--- proftpd/trunk/proftpd-1.3.4rc1-tests.patch (original) +++ proftpd/trunk/proftpd-1.3.4rc1-tests.patch Sun Dec 26 16:21:08 2010 @@ -931,3 +931,24 @@ fail_if(v == NULL, "Failed to allocate %u-len memory", sz); for (i = 0; i < sz; i++) { fail_unless(v[i] == 0, "Allocated non-zero memory at position %u", i); +diff -up proftpd-1.3.4rc1/tests/api/timers.c.tests proftpd-1.3.4rc1/tests/api/timers.c +--- proftpd-1.3.4rc1/tests/api/timers.c.tests 2010-08-11 15:56:36.000000000 +0100 ++++ proftpd-1.3.4rc1/tests/api/timers.c 2010-12-24 11:03:17.625550991 +0000 +@@ -121,7 +121,7 @@ + timers_handle_signals(); + + ok = 2; +- fail_unless(timer_triggered_count == ok, ++ fail_unless(timer_triggered_count == ok || timer_triggered_count == ok + 1, + "Timer failed to fire (expected count %u, got %u)", ok, + timer_triggered_count); + +@@ -129,7 +129,7 @@ + timers_handle_signals(); + + ok = 3; +- fail_unless(timer_triggered_count == ok, ++ fail_unless(timer_triggered_count == ok || timer_triggered_count == ok + 1, + "Timer failed to fire (expected count %u, got %u)", ok, + timer_triggered_count); + }Branched trac-accountmanager-plugin to maintain separate versions for trac 0.11 and trac 0.12
Updated trac-accountmanager-plugin for releases with trac 0.12 (EL-6 and Rawhide) to snapshot from svn revision 9591, adding a dependency on python-genshi ≥ 0.6 (Rawhide) or python-genshi06 (EL-6) and running the test suite during the build
- I also needed to apply this patch to get the test suite to work:
--- TracAccountManager-0.3dev-r9591/acct_mgr/tests/htfile.py.orig 2010-10-09 20:14:43.000000000 +0100 +++ TracAccountManager-0.3dev-r9591/acct_mgr/tests/htfile.py 2010-12-21 16:31:07.012399185 +0000 @@ -79,6 +79,7 @@ self.assertEqual([], list(self.store.get_users())) def test_update_password(self): + self._init_password_file('test_update_password', '') self.store.set_password('foo', 'pass1') self.assertFalse(self.store.check_password('foo', 'pass2')) self.store.set_password('foo', 'pass2') @@ -130,6 +131,7 @@ self.assertEqual([], list(self.store.get_users())) def test_update_password(self): + self._init_password_file('test_update_password', '') self.store.set_password('foo', 'pass1') self.assertFalse(self.store.check_password('foo', 'pass2')) self.store.set_password('foo', 'pass2') @@ -138,6 +140,7 @@ self.assertTrue(self.store.check_password('foo', 'pass3')) def test_create_hash(self): + self._init_password_file('test_create_hash', '') self.env.config.set('account-manager', 'htpasswd_hash_type', 'bad') self.assertTrue(self.store.userline('user', 'password').startswith('user:'))