Testsuite: Assume '' for missing VERSION_ID
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Sat, 12 Nov 2016 21:48:37 +0000 (22:48 +0100)
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Sat, 12 Nov 2016 21:49:11 +0000 (22:49 +0100)
test/lib/Exim/Runtest.pm
test/t/00-basic.t
test/t/samples/debian.sid/etc/os-release [new file with mode: 0644]
test/t/samples/debian8+debian-version/etc/debian_version [moved from test/t/samples/etc.debian8-debian-version/debian_version with 100% similarity]
test/t/samples/debian8+os-release/etc/debian_version [moved from test/t/samples/etc.debian8-os-release/debian_version with 100% similarity]
test/t/samples/debian8+os-release/etc/os-release [moved from test/t/samples/etc.debian8-os-release/os-release with 100% similarity]
test/t/samples/fedora24/etc/os-release [moved from test/t/samples/etc.fedora24/os-release with 100% similarity]

index 32537f5..ce91084 100644 (file)
@@ -119,7 +119,7 @@ sub flavour {
     if (open(my $f, '<', "$etc/os-release")) {
         local $_ = join '', <$f>;
         my ($id) = /^ID="?(.*?)"?\s*$/m;
-        my ($version) = /^VERSION_ID="?(.*?)"?\s*$/m;
+        my $version = /^VERSION_ID="?(.*?)"?\s*$/m ? $1 : '';
         return "$id$version";
     }
 
index 49d6f68..092591e 100644 (file)
@@ -40,9 +40,10 @@ subtest 'exim_binary' => sub {
 };
 
 subtest 'flavour' => sub {
-    is flavour('t/samples/etc.debian8-os-release'), 'debian8' => 'got flavour debian8 from os-release';
-    is flavour('t/samples/etc.debian8-debian-version'), 'debian8' => 'got flavour debian8 from debian_version';
-    is flavour('t/samples/etc.fedora24'), 'fedora24' => 'got flavour fedora24 from os-release';
+    is flavour('t/samples/debian8+os-release/etc'), 'debian8' => 'got flavour debian8 from os-release';
+    is flavour('t/samples/debian8+debian-version/etc'), 'debian8' => 'got flavour debian8 from debian_version';
+    is flavour('t/samples/debian.sid/etc'), 'debian' => 'got flavour debian from debian sid w/o VERSION_ID';
+    is flavour('t/samples/fedora24/etc'), 'fedora24' => 'got flavour fedora24 from os-release';
     is_deeply [flavours()], ['debian8'] => 'got available flavours';
 };
 
diff --git a/test/t/samples/debian.sid/etc/os-release b/test/t/samples/debian.sid/etc/os-release
new file mode 100644 (file)
index 0000000..959aa16
--- /dev/null
@@ -0,0 +1,6 @@
+PRETTY_NAME="Debian GNU/Linux stretch/sid"
+NAME="Debian GNU/Linux"
+ID=debian
+HOME_URL="https://www.debian.org/"
+SUPPORT_URL="https://www.debian.org/support"
+BUG_REPORT_URL="https://bugs.debian.org/"