[libcloud] branch trunk updated (d6cd8eed8 -> ef1ff67c4)

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomaz pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git


    from d6cd8eed8 Merge pull request #1692 from ogayot/test-connection-https-proxy
     new c3c0965ab Call server_close() instead of calling .close() directly on the underlying socket.
     new ef1ff67c4 Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud into trunk

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 libcloud/test/test_http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[libcloud] 02/02: Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud into trunk

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git

commit ef1ff67c47b5abe1786f95b76943fb869ab7044b
Merge: c3c0965ab d6cd8eed8
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Wed May 11 20:38:50 2022 +0200

    Merge branch 'trunk' of http://gitbox.apache.org/repos/asf/libcloud into trunk

 libcloud/test/test_connection.py | 17 ++++++++---------
 libcloud/test/test_http.py       | 13 +++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --cc libcloud/test/test_http.py
index ed22735a7,b018adeac..95c89802b
--- a/libcloud/test/test_http.py
+++ b/libcloud/test/test_http.py
@@@ -118,9 -121,19 +121,19 @@@ class HttpLayerTestCase(unittest.TestCa
      @classmethod
      def tearDownClass(cls):
          cls.mock_server.shutdown()
 -        cls.mock_server.socket.close()
 +        cls.mock_server.server_close()
          cls.mock_server_thread.join()
  
+         if cls.orig_http_proxy:
+             os.environ["http_proxy"] = cls.orig_http_proxy
+         elif "http_proxy" in os.environ:
+             del os.environ["http_proxy"]
+ 
+         if cls.orig_https_proxy:
+             os.environ["https_proxy"] = cls.orig_https_proxy
+         elif "https_proxy" in os.environ:
+             del os.environ["https_proxy"]
+ 
      def test_prepared_request_empty_body_chunked_encoding_not_used(self):
          connection = LibcloudConnection(host=self.listen_host, port=self.listen_port)
          connection.prepared_request(

[libcloud] 01/02: Call server_close() instead of calling .close() directly on the underlying socket.

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git

commit c3c0965ab171cd5a9d2a104745887dd8c4e2bf0e
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Wed May 11 20:37:57 2022 +0200

    Call server_close() instead of calling .close() directly on the
    underlying socket.
---
 libcloud/test/test_http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcloud/test/test_http.py b/libcloud/test/test_http.py
index 68ddf9045..ed22735a7 100644
--- a/libcloud/test/test_http.py
+++ b/libcloud/test/test_http.py
@@ -118,7 +118,7 @@ class HttpLayerTestCase(unittest.TestCase):
     @classmethod
     def tearDownClass(cls):
         cls.mock_server.shutdown()
-        cls.mock_server.socket.close()
+        cls.mock_server.server_close()
         cls.mock_server_thread.join()
 
     def test_prepared_request_empty_body_chunked_encoding_not_used(self):