Merge ~bryce/ubuntu/+source/apache2:groovy-apache-2.4.43-merge into ubuntu/+source/apache2:ubuntu/devel

[Bryce Harrington]

This is a cherry-pick of an experimental patch from upstream used to work around a failure in a test case. The failure appears intermittently in our autopkgtest runs, and which is currently blocking the merge of 2.4.43 for groovy.

This branch sprouts from andreas' merge branch, https://code.launchpad.net/~ahasenack/ubuntu/+source/apache2/+git/apache2/+ref/groovy-apache-2.4.43-merge, because ubuntu/devel is not up to date in git-ubuntu due to some troubles it has with the apache2 import presently. For this reason, the launchpad diff shown below is incorrect, just ignore it. I've pastebinned the actual delta:

$ git diff ahasenack/groovy-apache-2.4.43-merge | pastebinit
https://paste.ubuntu.com/p/wRMpt48Wxr/

[Andreas Hasenack (ahasenack)]

+1, just an extra dot in the beginning of changelog line:

* ./d/p/t/apache/expr_string.t

I'll see if I can kick an update of the apache2 git repo

review: Approve

[Bryce Harrington (bryce)]

Thanks, fix applied, and uploaded.

$ dput ubuntu apache2_2.4.43-1ubuntu2_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/Apache2/apache2_2.4.43-1ubuntu2_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/Apache2/apache2_2.4.43-1ubuntu2.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.43-1ubuntu2.dsc: done.
  Uploading apache2_2.4.43-1ubuntu2.debian.tar.xz: done.
  Uploading apache2_2.4.43-1ubuntu2_source.buildinfo: done.
  Uploading apache2_2.4.43-1ubuntu2_source.changes: done.
Successfully uploaded packages.

I also pushed the matching updated branch to my namespace:

$ git push --force bryce groovy-apache-2.4.43
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 12 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.33 KiB | 41.00 KiB/s, done.
Total 11 (delta 9), reused 0 (delta 0)
remote: Checking connectivity: 11, done.
remote:
remote: Create a merge proposal for 'groovy-apache-2.4.43-merge' on Launchpad by visiting:
remote: https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+ref/groovy-apache-2.4.43-merge/+register-merge
remote:
To ssh://git.launchpad.net/~bryce/ubuntu/+source/apache2
 + dd3d8dcc...9fbc4e67 groovy-apache-2.4.43 -> groovy-apache-2.4.43-merge (forced update)

[Bryce Harrington (bryce)]

This transitioned

diff --git a/debian/changelog b/debian/changelog
index c5843c5..d789566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+<<<<<<< debian/changelog
+=======
+apache2 (2.4.43-1ubuntu2) groovy; urgency=medium
+
+  * d/p/t/apache/expr_string.t: Avoid test suite failure due to timing
+    issue reading error log too quickly after request, by adding a sleep.
+    (LP: #1890302)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 05 Aug 2020 12:44:59 -0700
+
+>>>>>>> debian/changelog
 apache2 (2.4.43-1ubuntu1) groovy; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/perl-framework/t/apache/expr_string.t b/debian/perl-framework/t/apache/expr_string.t
index a9115ee..66b0903 100644
--- a/debian/perl-framework/t/apache/expr_string.t
+++ b/debian/perl-framework/t/apache/expr_string.t
@@ -7,6 +7,8 @@ use Apache::TestUtil qw(t_write_file t_start_error_log_watch t_finish_error_log_
 
 use File::Spec;
 
+use Time::HiRes qw(usleep);
+
 # test ap_expr
 
 Apache::TestRequest::user_agent(keep_alive => 1);
@@ -62,6 +64,8 @@ foreach my $t (@test_cases) {
                        'SomeHeader' => 'SomeValue',
                        'User-Agent' => 'SomeAgent',
                        'Referer'    => 'SomeReferer');
+    ### Sleep here, attempt to avoid intermittent failures. (LP: #1890302)
+    usleep(250000);
     my @loglines = t_finish_error_log_watch();
 
     my @evalerrors = grep {/(?:internal evaluation error|flex scanner jammed)/i