Merge ~lucaskanashiro/+git/ruby-webmock:fix-autopkgtest-in-ubuntu into ~lucaskanashiro/+git/ruby-webmock:master

[Lucas Kanashiro]

Fixed LP #1885760. This is a Ubuntu specific change so no need to forward it. The proposed change fixes autopkgtest of ruby-webmock as you can see here:

https://bileto.ubuntu.com/excuses/4123/groovy.html

[Andreas Hasenack (ahasenack)]

+1

You guarded the change well, debian can probably take it

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Andreas! Uploaded:

$ dput ubuntu ruby-webmock_3.8.3-1ubuntu1_source.changes
Checking signature on .changes
gpg: /home/kanashiro/packaging/ubuntu/ruby-webmock/ruby-webmock_3.8.3-1ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: /home/kanashiro/packaging/ubuntu/ruby-webmock/ruby-webmock_3.8.3-1ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ruby-webmock_3.8.3-1ubuntu1.dsc: done.
  Uploading ruby-webmock_3.8.3-1ubuntu1.debian.tar.xz: done.
  Uploading ruby-webmock_3.8.3-1ubuntu1_source.changes: done.
Successfully uploaded packages.

And you are right, I'll commit this change on salsa.

[Lucas Kanashiro (lucaskanashiro)]

It is commited on salsa:

https://salsa.debian.org/ruby-team/ruby-webmock/-/commit/b07284b6a244a59ef950fc7073fbc8b1e737a44a

Unmerged commits

2b7041d... by Lucas Kanashiro on 2020-06-30

Update maintainer

935dc9f... by Lucas Kanashiro on 2020-06-30

Update changelog

6aafdfe... by Lucas Kanashiro on 2020-06-30

Set no_proxy correctly when running autopkgtest (LP: #1885760)

diff --git a/debian/changelog b/debian/changelog
index 1b5f408..5e08cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-webmock (3.8.3-1ubuntu1) groovy; urgency=medium
+
+  * Set no_proxy correctly when running autopkgtest (LP: #1885760)
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 30 Jun 2020 15:13:27 -0300
+
 ruby-webmock (3.8.3-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index 1721aa0..72563ee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ruby-webmock
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
 Uploaders: Pirate Praveen <[e-mail]>
 Build-Depends: debhelper-compat (= 12),
                gem2deb (>= 1),
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 34a594b..77470d6 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -3,6 +3,13 @@ require "rspec"
 
 ENV["NO_CONNECTION"]="true"
 
+# Some tests rely on http://0.0.0.0 and they fail in Ubuntu autopkgtest env.
+if ENV["AUTOPKGTEST_TMP"]
+  if ENV["no_proxy"]
+    ENV["no_proxy"] += ",0.0.0.0"
+  end
+end
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
   t.pattern = FileList["spec/**/*_spec.rb"].exclude("spec/acceptance/patron/*").exclude('spec/quality_spec.rb').exclude('spec/acceptance/async_http_client/*').exclude('spec/acceptance/excon/excon_spec.rb').exclude('spec/acceptance/http_rb/http_rb_spec.rb')