[Libosinfo] [PATCH osinfo-db 3/6] debian8: fix 8.10 iso media detection

[Cole Robinson]

And add some extra test content

Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
 data/os/debian.org/debian-8.xml.in            |  4 +--
 .../debian8/debian-8.10.0-amd64-DVD-1.iso.txt | 29 +++++++++++++++++++
 .../debian-8.10.0-amd64-kde-CD-1.iso.txt      | 29 +++++++++++++++++++
 .../debian-8.10.0-amd64-netinst.iso.txt       | 29 +++++++++++++++++++
 .../debian8/debian-8.10.0-i386-DVD-3.iso.txt  | 16 ++++++++++
 5 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt
 create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt
 create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt
 create mode 100644 tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt

diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
index 3752798..db6d8c8 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -35,7 +35,7 @@
     <media arch="i686">
       <url>http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/i386/iso-dvd/debian-8.10.0-i386-DVD-1.iso</url>
       <iso>
-        <volume-id>Debian 8.\d.\d i386 1</volume-id>
+        <volume-id>Debian 8.\d+.\d+ i386 .*</volume-id>
       </iso>
       <kernel>install.386/vmlinuz</kernel>
       <initrd>install.386/initrd.gz</initrd>
@@ -43,7 +43,7 @@
     <media arch="x86_64">
       <url>http://cdimage.debian.org/mirror/cdimage/archive/8.10.0/amd64/iso-dvd/debian-8.10.0-amd64-DVD-1.iso</url>
       <iso>
-        <volume-id>Debian 8.\d.\d amd64 1</volume-id>
+        <volume-id>Debian 8.\d+.\d+ amd64 .*</volume-id>
       </iso>
       <kernel>install.amd/vmlinuz</kernel>
       <initrd>install.amd/initrd.gz</initrd>
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt
new file mode 100644
index 0000000..641ef6a
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-amd64-DVD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Debian 8.10.0 amd64 1
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1937712
+El Torito VD version 1 found, boot catalog is in sector 5126
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 14D7 5335
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt
new file mode 100644
index 0000000..0711a53
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-amd64-kde-CD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Debian 8.10.0 amd64 1
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 323072
+El Torito VD version 1 found, boot catalog is in sector 2050
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 8D3 2259
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt
new file mode 100644
index 0000000..26636ac
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-amd64-netinst.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Debian 8.10.0 amd64 1
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 126976
+El Torito VD version 1 found, boot catalog is in sector 974
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 49F 1183
diff --git a/tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt b/tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt
new file mode 100644
index 0000000..15476f0
--- /dev/null
+++ b/tests/isodata/debian/debian8/debian-8.10.0-i386-DVD-3.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Debian 8.10.0 i386 3
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.4.6 2016.09.16.133001, LIBISOBURN-1.4.6, LIBISOFS-1.4.6, LIBBURN-1.4.6
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 2266228
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
-- 
2.21.0