From: Javier Bértoli <jbertoli@curii.com>
Date: Wed, 4 Aug 2021 17:12:43 +0000 (-0300)
Subject: Update repo tests in Debian's family
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/4aa8b1af9c63b3f249a47562ee2fe1123f91a686

Update repo tests in Debian's family

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---

diff --git a/test/integration/repo/controls/repo_spec.rb b/test/integration/repo/controls/repo_spec.rb
index 8f5edaf..c112538 100644
--- a/test/integration/repo/controls/repo_spec.rb
+++ b/test/integration/repo/controls/repo_spec.rb
@@ -10,16 +10,16 @@ when 'centos'
   repo_url = 'baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/'
 when 'debian', 'ubuntu'
   # Inspec does not provide a `codename` matcher, so we add ours
-  case os[:release]
+  case platform[:release].to_f.truncate
   # ubuntu
-  when '18.04'
+  when 18
     codename = 'bionic'
-  when '20.04'
+  when 20
     codename = 'focal'
   # debian
-  when '10'
+  when 10
     codename = 'buster'
-  when '11'
+  when 11
     codename = 'bullseye'
   end
   repo_file = '/etc/apt/sources.list.d/arvados.list'
diff --git a/test/integration/shell/controls/repo_spec.rb b/test/integration/shell/controls/repo_spec.rb
index f6f8e2c..0fdbdff 100644
--- a/test/integration/shell/controls/repo_spec.rb
+++ b/test/integration/shell/controls/repo_spec.rb
@@ -6,16 +6,16 @@ when 'centos'
   repo_url = 'baseurl=http://rpm.arvados.org/CentOS/$releasever/dev/$basearch/'
 when 'debian', 'ubuntu'
   # Inspec does not provide a `codename` matcher, so we add ours
-  case os[:release]
+  case platform[:release].to_f.truncate
   # ubuntu
-  when '18.04'
+  when 18
     codename = 'bionic'
-  when '20.04'
+  when 20
     codename = 'focal'
   # debian
-  when '10'
+  when 10
     codename = 'buster'
-  when '11'
+  when 11
     codename = 'bullseye'
   end
   repo_file = '/etc/apt/sources.list.d/arvados.list'