1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Subject: Collected Debian patches for krb5-sync
Author: Russ Allbery <rra@debian.org>
Since I am also upstream for this package, there will normally not be any
patches to apply to the upstream source. However, occasionally I'll pull
up specific upstream commits prior to making an upstream release. When
this happens, this patch will collect all of those modifications.
I use Git to maintain both the upstream source and the Debian packages,
and generating individual patches rather than using git cherry-pick takes
extra work for no gain. Since I'm also upstream, there's no need to
separate the patches for later upstream submission. Hence, I take this
approach with a unified patch when it's necessary.
For full commit history and separated commits, see the upstream Git
repsitory.
--- krb5-sync-3.0.orig/tests/tools/backend-t
+++ krb5-sync-3.0/tests/tools/backend-t
@@ -87,9 +87,9 @@ sub run_backend_checked {
# Given a user, an action, and (for a password change) the new password,
# locate that queued action and check that the correct information was stored
-# for it. Expects the action to have been queued in the past second. Reports
-# results with Test::More functions. Always uses a directory named 'queue'
-# under test_tmpdir() as the queue directory.
+# for it. Expects the action to have been queued in the five seconds.
+# Reports results with Test::More functions. Always uses a directory named
+# 'queue' under test_tmpdir() as the queue directory.
#
# $user - User for which the action should be queued
# $action - The queued action, chosen from enable, disable, or password
@@ -109,9 +109,12 @@ sub check_queued_action {
# with the same timestamp with a non-zero sequence number.
my $now = time;
my $path;
- for my $time ($now - 1 .. $now) {
- $path = $base . strftime('%Y%m%dT%H%M%SZ-00', gmtime($time));
- last if -f $path;
+ for my $time ($now - 10 .. $now + 1) {
+ my $candidate = $base . strftime('%Y%m%dT%H%M%SZ-00', gmtime($time));
+ if (-f $candidate) {
+ $path = $candidate;
+ last;
+ }
}
ok(defined($path), 'Queued change found');
|
