Bump up memcached version (#919)

petergoldstein · Jun 15, 2022 · 959961b · 959961b
1 parent 8b00198
commit 959961b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,6 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         ruby-version:
           - head
@@ -15,7 +16,7 @@ jobs:
           - '2.7'
           - '2.6'
           - jruby-9.3
-        memcached-version: ['1.5.22', '1.6.14']
+        memcached-version: ['1.5.22', '1.6.15']
 
     steps:
     - uses: actions/checkout@v3

diff --git a/test/helper.rb b/test/helper.rb
@@ -21,6 +21,9 @@
 # supported protocols
 raise StandardError, 'No supported version of memcached could be found.' unless MemcachedManager.version
 
+# Generate self-signed certs for SSL once per suite run.
+CertificateGenerator.generate
+
 module MiniTest
   class Spec
     include Memcached::Helper

diff --git a/test/helpers/memcached.rb b/test/helpers/memcached.rb
@@ -53,7 +53,6 @@ def memcached_persistent(protocol = :binary, port_or_socket = 21_345, args = '',
 
     # Launches a persistent memcached process, configured to use SSL
     def memcached_ssl_persistent(protocol = :binary, port_or_socket = rand(21_397..21_896), &block)
-      CertificateGenerator.generate
       memcached_persistent(protocol,
                            port_or_socket,
                            CertificateGenerator.ssl_args,

diff --git a/test/utils/certificate_generator.rb b/test/utils/certificate_generator.rb
@@ -15,7 +15,7 @@ module CertificateGenerator
 
   def self.generate
     issuer_cert, issuer_key = generate_root_certificate
-    generate_server_certifcate(issuer_cert, issuer_key)
+    generate_server_certificate(issuer_cert, issuer_key)
   end
 
   def self.ssl_args
@@ -37,7 +37,7 @@ def self.ssl_context
     ssl_context
   end
 
-  def self.generate_server_certifcate(issuer_cert, issuer_key)
+  def self.generate_server_certificate(issuer_cert, issuer_key)
     cert, key = generate_certificate_common('/CN=localhost', issuer_cert)
     cert.serial = 2