update tests

update rpm test data (truncated)

2 files changed, 26 insertions, 396 deletions

diff --git a/spec/data/plugins/rpmquery.output b/spec/data/plugins/rpmquery.output
index 142fd2fa..02de1a61 100644
--- a/spec/data/plugins/rpmquery.output
+++ b/spec/data/plugins/rpmquery.output
@@ -1,388 +1,5 @@
-ntp	4.2.6p5	3.el6_6
-perl-CGI	3.51	136.el6_6.1
-mailx	12.4	8.el6_6
-libattr	2.4.44	7.el6
-perl-ExtUtils-ParseXS	2.2003.0	136.el6_6.1
-redhat-lsb-core	4.0	7.el6
-libsepol	2.0.41	4.el6
-screen	4.0.3	16.el6
-coreutils-libs	8.4	37.el6
-bzip2-libs	1.0.5	7.el6_0
-gpg-pubkey	66fd4949	4803fe57
-libudev	147	2.57.el6
-hal-libs	0.5.14	14.el6
-plymouth-scripts	0.8.3	27.el6_5.1
-libgpg-error	1.7	4.el6
-libselinux-utils	2.0.94	5.8.el6
-sqlite	3.6.20	1.el6
-libxcb	1.9.1	2.el6
-libxml2	2.7.6	17.el6_6.1
-p11-kit-trust	0.18.5	2.el6_5.2
-libgcrypt	1.4.5	11.el6_4
-upstart	0.6.5	13.el6_5.3
-checkpolicy	2.0.22	1.el6
-procps	3.2.8	30.el6
-pth	2.0.7	9.3.el6
-libX11	1.6.0	2.2.el6
-less	436	13.el6
-libXdamage	1.1.3	4.el6
-file	5.04	21.el6
-cryptsetup-luks	1.2.0	11.el6
-libXfont	1.4.5	4.el6_6
-eggdbus	0.6	3.el6
-python-rhsm	1.12.5	2.el6
-hal-info	20090716	3.1.el6
-hwdata	0.233	11.1.el6
-diffutils	2.8.1	28.el6
-mesa-libGL	10.1.2	2.el6
-initscripts	9.03.46	1.el6_6.1
-which	2.19	6.el6
-xorg-x11-drv-vmware	13.0.1	9.el6
-cracklib-dicts	2.8.16	4.el6
-libdrm	2.4.52	4.el6
-logrotate	3.7.8	17.el6
-mingetty	1.08	5.el6
-unzip	6.0	2.el6_6
-e2fsprogs	1.41.12	21.el6
-fipscheck-lib	1.2.0	7.el6
-cyrus-sasl	2.1.23	15.el6_6.2
-dmidecode	2.12	5.el6_5
-libnl	1.1.4	2.el6
-chef	12.2.1	1.el6
-ql2400-firmware	7.03.00	1.el6_5
-gdbm	1.8.0	36.el6
-xorg-x11-server-Xorg	1.15.0	26.el6_6
-python-dateutil	1.4.1	6.el6
-openssh	5.3p1	104.el6_6.1
-dbus	1.2.24	8.el6_6
-perl-version	0.77	136.el6_6.1
-pygpgme	0.1	18.20090824bzr68.el6
-dracut-kernel	004	356.el6_6.2
-perl	5.10.1	136.el6_6.1
-rhnlib	2.5.22	15.el6
-nss-sysinit	3.18.0	5.3.el6_6
-pygobject2	2.20.0	5.el6
-selinux-policy	3.7.19	260.el6_6.3
-openssh-clients	5.3p1	104.el6_6.1
-ca-certificates	2015.2.4	65.0.1.el6_6
-device-mapper-event-libs	1.02.90	2.el6_6.3
-bind-utils	9.8.2	0.30.rc1.el6_6.3
-rpm-python	4.8.0	38.el6_6
-glibc-common	2.12	1.149.el6_6.9
-kernel-firmware	2.6.32	504.23.4.el6
-libssh2	1.4.2	1.el6_6.1
-openssl-devel	1.0.1e	30.el6_6.11
-nss-softokn	3.14.3	22.el6_6
-tree	1.5.3	2.el6
-virt-what	1.11	1.2.el6
-rpcbind	0.2.0	11.el6
-nfs-utils	1.2.3	54.el6
-autoconf	2.63	5.1.el6
-cloog-ppl	0.15.7	1.2.el6
-b43-openfwwf	5.2	4.el6
-iwl1000-firmware	39.31.5.1	1.el6
-libstdc++-devel	4.4.7	11.el6
-xz	4.999.9	0.5.beta.20091007git.el6
-acl	2.2.49	6.el6
-elfutils	0.158	3.2.el6
-ql2100-firmware	1.19.38	3.1.el6
-fakeroot	1.12.2	22.2.el6
-rt61pci-firmware	1.2	7.el6
-perl-IO-Compress-Base	2.021	136.el6_6.1
-ipw2100-firmware	1.3	11.el6
-gpg-pubkey	fd431d51	4ae0493b
-libcom_err-devel	1.41.12	21.el6
-kernel	2.6.32	504.12.2.el6
-filesystem	2.4.30	3.el6
-basesystem	10.0	4.el6
-time	1.7	37.1.el6
-cvs	1.11.23	16.el6
-pax	3.4	10.1.el6
-at	3.1.10	44.el6_6.2
-libgcc	4.4.7	11.el6
-libcap	2.16	5.5.el6
-ed	1.1	3.3.el6
-redhat-release-server	6Server	6.6.0.2.el6
-info	4.13a	8.el6
-popt	1.13	7.el6
-perl-Test-Harness	3.17	136.el6_6.1
-bash	4.1.2	29.el6
-libacl	2.2.49	6.el6
-perl-ExtUtils-MakeMaker	6.55	136.el6_6.1
-perl-Test-Simple	0.92	136.el6_6.1
-libcom_err	1.41.12	21.el6
-iotop	0.3.2	7.el6
-audit-libs	2.3.7	5.el6
-wemux	3.2.0	1.el6
-grep	2.6.3	6.el6
-libdnet	1.12	6.el6
-coreutils	8.4	37.el6
-libblkid	2.17.2	12.18.el6
-pcre	7.8	6.el6
-lua	5.1.4	4.1.el6
-mesa-dri-filesystem	10.1.2	2.el6
-cpio	2.10	12.el6_5
-libXau	1.0.6	4.el6
-p11-kit	0.18.5	2.el6_5.2
-glib2	2.28.8	4.el6
-grubby	7.0.15	7.el6
-expat	2.0.1	11.el6_2
-bzip2	1.0.5	7.el6_0
-openldap	2.4.39	8.el6
-libss	1.41.12	21.el6
-psmisc	22.6	19.el6_5
-sysvinit-tools	2.87	5.dsf.el6
-libstdc++	4.4.7	11.el6
-libX11-common	1.6.0	2.2.el6
-pciutils-libs	3.1.10	4.el6
-libXfixes	5.0.1	2.1.el6
-gzip	1.3.12	22.el6
-libxslt	1.1.26	2.el6_3.1
-libXxf86vm	1.1.3	2.1.el6
-file-libs	5.04	21.el6
-libxkbfile	1.0.6	1.1.el6
-ethtool	3.5	5.el6
-gmp	4.3.1	7.el6_2.2
-cryptsetup-luks-libs	1.2.0	11.el6
-libnih	1.0.1	7.el6
-python-libs	2.6.6	52.el6
-libutempter	1.1.5	4.1.el6
-yum	3.2.29	60.el6
-vim-minimal	7.2.411	1.8.el6
-gnupg2	2.0.14	8.el6
-net-tools	1.60	110.el6_2
-redhat-support-lib-python	0.9.6	1.el6
-tar	1.23	11.el6
-mysql-libs	5.1.73	3.el6_5
-module-init-tools	3.9	24.el6
-pinentry	0.7.6	6.el6
-iptables	1.4.7	14.el6
-util-linux-ng	2.17.2	12.18.el6
-m4	1.4.13	5.el6
-udev	147	2.57.el6
-dash	0.5.5.1	4.el6
-rhn-client-tools	1.0.0.1	18.el6
-groff	1.18.1.4	21.el6
-cracklib	2.8.16	4.el6
-rhn-setup	1.0.0.1	18.el6
-redhat-logos	60.0.14	1.el6
-libpciaccess	0.13.3	0.1.el6
-plymouth	0.8.3	27.el6_5.1
-libcap-ng	0.6.4	3.el6_0.1
-rhn-check	1.0.0.1	18.el6
-bfa-firmware	3.2.23.0	2.el6
-redhat-support-tool	0.9.6	2.el6
-gpgme	1.1.8	3.el6
-authconfig	6.1.12	19.el6
-efibootmgr	0.5.4	12.el6
-sudo	1.8.6p3	15.el6
-fipscheck	1.2.0	7.el6
-cyrus-sasl-lib	2.1.23	15.el6_6.2
-audit	2.3.7	5.el6
-libsemanage	2.0.43	4.2.el6
-elfutils-libelf	0.158	3.2.el6
-gpg-pubkey	83ef826a	4a690bb4
-xorg-x11-drv-ati-firmware	7.3.99	2.el6
-newt	0.52.11	3.el6
-xorg-x11-server-common	1.15.0	26.el6_6
-ql2500-firmware	7.03.00	1.el6_5
-libffi	3.0.5	3.2.el6
-krb5-devel	1.10.3	37.el6_6
-shadow-utils	4.1.4.2	19.el6_6.1
-python-iniparse	0.3.1	2.1.el6
-newt-python	0.52.11	3.el6
-dbus-libs	1.2.24	8.el6_6
-python-lxml	2.2.3	1.1.el6
-python-ethtool	0.6	5.el6
-python-dmidecode	3.10.13	3.el6_4
-perl-Pod-Escapes	1.04	136.el6_6.1
-runit	2.1.2	1.el6
-perl-Module-Pluggable	3.90	136.el6_6.1
-python-pycurl	7.19.0	8.el6
-dracut	004	356.el6_6.2
-perl-Pod-Simple	3.13	136.el6_6.1
-pyOpenSSL	0.10	2.el6
-collectl	4.0.0	2.el6
-pkgconfig	0.23	9.1.el6
-nspr	4.10.8	1.el6_6
-libuser	0.56.13	5.el6
-dbus-python	0.83.0	6.1.el6
-nss	3.18.0	5.3.el6_6
-iproute	2.6.32	33.el6_6
-passwd	0.77	4.el6_2.2
-libedit	2.11	4.20080712cvs.1.el6
-yum-metadata-parser	1.1.2	16.el6
-selinux-policy-targeted	3.7.19	260.el6_6.3
-nss-tools	3.18.0	5.3.el6_6
-yum-rhn-plugin	0.9.1	52.3.el6_6
-kbd-misc	1.15	11.el6
-device-mapper-libs	1.02.90	2.el6_6.3
-rpm	4.8.0	38.el6_6
-device-mapper-event	1.02.90	2.el6_6.3
-bind-libs	9.8.2	0.30.rc1.el6_6.3
-lvm2	2.02.111	2.el6_6.3
-glibc	2.12	1.149.el6_6.9
-rsyslog	5.8.10	10.el6_6
-glibc-headers	2.12	1.149.el6_6.9
-system-config-firewall-base	1.2.27	7.2.el6_6
-usermode	1.102	3.el6
-glibc-static	2.12	1.149.el6_6.9
-nss-softokn-freebl	3.14.3	22.el6_6
-openssl	1.0.1e	30.el6_6.11
-db4-cxx	4.7.25	19.el6_6
-libcurl	7.19.7	40.el6_6.4
-kernel	2.6.32	504.23.4.el6
-dhclient	4.1.1	43.P1.el6_6.1
-db4-utils	4.7.25	19.el6_6
-kernel-devel	2.6.32	504.23.4.el6
-vim-common	7.2.411	1.8.el6
-cronie-anacron	1.4.4	12.el6
-vim-enhanced	7.2.411	1.8.el6
-crontabs	1.10	33.el6
-sysstat	9.0.4	27.el6
-libtirpc	0.2.1	10.el6
-keyutils	1.4	5.el6
-nfs-utils-lib	1.1.5	9.el6
-gnutls	2.8.5	14.el6_5
-rsyslog-relp	5.8.10	10.el6_6
-bison	2.4.1	5.el6
-iwl5150-firmware	8.24.2.2	1.el6
-ppl	0.10.2	11.el6
-iwl6050-firmware	41.28.5.1	2.el6
-libgomp	4.4.7	11.el6
-iwl6000g2a-firmware	17.168.5.3	1.el6
-cpp	4.4.7	11.el6
-iwl6000-firmware	9.221.4.1	1.el6
-gcc	4.4.7	11.el6
-gcc-c++	4.4.7	11.el6
-patch	2.6	6.el6
-xz-lzma-compat	4.999.9	0.5.beta.20091007git.el6
-attr	2.4.44	7.el6
-elfutils-libs	0.158	3.2.el6
-iwl5000-firmware	8.83.5.1_1	1.el6_1.1
-ivtv-firmware	20080701	20.2
-fakeroot-libs	1.12.2	22.2.el6
-wget	1.12	5.el6_6.1
-atmel-firmware	1.3	7.el6
-rpmdevtools	7.5	2.el6
-iwl4965-firmware	228.61.2.24	2.1.el6
-iwl3945-firmware	15.32.2.9	4.el6
-perl-Compress-Raw-Zlib	2.021	136.el6_6.1
-rt73usb-firmware	1.8	7.el6
-perl-IO-Compress-Zlib	2.021	136.el6_6.1
-ql23xx-firmware	3.03.27	3.1.el6
-perl-Time-HiRes	1.9721	136.el6_6.1
-rootfiles	8.1	6.1.el6
-htop	1.0.1	2.el6
-gpg-pubkey	2fa658e0	45700c69
-zlib-devel	1.2.3	29.el6
-libsepol-devel	2.0.41	4.el6
-keyutils-libs-devel	1.4	5.el6
-ntpdate	4.2.6p5	3.el6_6
-freetype	2.3.11	15.el6_6.1
-libfontenc	1.0.5	2.el6
-xkeyboard-config	2.11	1.el6
-libXdmcp	1.1.1	3.el6
-ConsoleKit	0.4.1	3.el6
-pm-utils	1.2.5	11.el6
-hal	0.5.14	14.el6
-mesa-private-llvm	3.4	3.el6
-mesa-dri1-drivers	7.11	8.el6
-xorg-x11-drv-vmmouse	13.0.0	2.el6
-setup	2.8.14	20.el6_4.1
-kernel-devel	2.6.32	504.12.2.el6
-ncurses-base	5.7	3.20090208.el6
-gettext	0.17	18.el6
-ncurses-libs	5.7	3.20090208.el6
-bc	1.06.95	1.el6
-zlib	1.2.3	29.el6
-gdbm-devel	1.8.0	36.el6
-chkconfig	1.3.49.3	2.el6_4.1
-perl-devel	5.10.1	136.el6_6.1
-libselinux	2.0.94	5.8.el6
-tmux	1.6	3.el6
-sed	4.2.1	10.el6
-libicu	4.2.1	9.1.el6_2
-pam	1.1.1	20.el6
-readline	6.0	4.el6
-libuuid	2.17.2	12.18.el6
-gawk	3.1.7	10.el6
-pixman	0.32.4	4.el6
-libtasn1	2.3	6.el6_5
-libidn	1.18	2.el6
-shared-mime-info	0.70	6.el6
-findutils	4.4.2	6.el6
-e2fsprogs-libs	1.41.12	21.el6
-tcp_wrappers-libs	7.6	57.el6
-ConsoleKit-libs	0.4.1	3.el6
-device-mapper-persistent-data	0.3.2	1.el6
-libXext	1.3.2	2.1.el6
-plymouth-core-libs	0.8.3	27.el6_5.1
-xorg-x11-xkb-utils	7.7	4.el6
-keyutils-libs	1.4	5.el6
-libusb	0.1.12	23.el6
-hdparm	9.43	4.el6
-python	2.6.6	52.el6
-MAKEDEV	3.24	6.el6
-libxml2-python	2.7.6	17.el6_6.1
-polkit	0.96	7.el6
-binutils	2.20.51.0.2	5.42.el6
-system-setup-keyboard	0.7	4.el6
-make	3.81	20.el6
-mesa-dri-drivers	10.1.2	2.el6
-policycoreutils	2.0.83	19.47.el6_6.1
-ncurses	5.7	3.20090208.el6
-iptables-ipv6	1.4.7	14.el6
-postfix	2.6.6	6.el6_5
-grub	0.97	93.el6
-libgudev1	147	2.57.el6
-ustr	1.0.4	9.1.el6
-xz-libs	4.999.9	0.5.beta.20091007git.el6
-slang	2.2.1	1.el6
-krb5-libs	1.10.3	37.el6_6
-m2crypto	0.20.2	9.el6
-python-simplejson	2.0.9	3.1.el6
-kernel	2.6.32	504.16.2.el6
-kernel-devel	2.6.32	504.16.2.el6
-perl-libs	5.10.1	136.el6_6.1
-python-urlgrabber	3.9.1	9.el6
-tzdata	2015d	1.el6
-gamin	0.1.10	9.el6
-nss-util	3.18.0	1.el6_6
-openssh-server	5.3p1	104.el6_6.1
-dbus-glib	0.86	6.el6_4
-python-gudev	147.1	4.el6_0.1
-device-mapper	1.02.90	2.el6_6.3
-rpm-libs	4.8.0	38.el6_6
-lvm2-libs	2.02.111	2.el6_6.3
-iputils	20071127	17.el6_4.2
-python-devel	2.6.6	52.el6
-subscription-manager	1.12.14	9.el6_6
-glibc-devel	2.12	1.149.el6_6.9
-dhcp-common	4.1.1	43.P1.el6_6.1
-rhnsd	4.9.3	2.el6
-db4	4.7.25	19.el6_6
-db4-devel	4.7.25	19.el6_6
-curl	7.19.7	40.el6_6.4
-kbd	1.15	11.el6
-kernel-headers	2.6.32	504.23.4.el6
-gpm-libs	1.20.6	12.el6
-cronie	1.4.4	12.el6
-libgssglue	0.1	11.el6
-libevent	1.4.13	4.el6
-librelp	1.2.7	3.el6
-flex	2.5.35	9.el6
-iwl100-firmware	39.31.5.1	1.el6
-mpfr	2.4.1	6.el6
-aic94xx-firmware	30	2.el6
-gdb	7.2	75.el6
-rpm-build	4.8.0	38.el6_6
-libertas-usb8388-firmware	5.110.22.p23	3.1.el6
-man	1.6f	32.el6
-zd1211-firmware	1.4	4.el6
-gpg-pubkey	0608b895	4bd22942
-ql2200-firmware	2.02.08	3.1.el6
-perl-Compress-Zlib	2.021	136.el6_6.1
-ipw2200-firmware	3.1	4.el6
-nc	1.84	22.el6
-libselinux-devel	2.0.94	5.8.el6
+centos-release	0	7	2.1511.el7.centos.2.10	1463486612	x86_64
+tzdata	0	2016d	1.el7	1463486618	noarch
+nss-softokn-freebl	0	3.16.2.3	14.2.el7_2	1463486619	x86_64
+glibc	0	2.17	106.el7_2.6	1463486666	x86_64
+libstdc++	0	4.8.5	4.el7	1463486669	x86_64
diff --git a/spec/unit/plugins/packages_spec.rb b/spec/unit/plugins/packages_spec.rb
index 62f3117e..0ee1d27b 100644
--- a/spec/unit/plugins/packages_spec.rb
+++ b/spec/unit/plugins/packages_spec.rb
@@ -27,6 +27,8 @@ describe Ohai::System, "plugin packages" do
       end
     end
 
+    let(:format) { '${Package}\t${Version}\t${Architecture}\n' }
+
     let(:stdout) do
       File.read(File.join(SPEC_PLUGIN_PATH, "dpkg-query.output"))
     end
@@ -34,14 +36,14 @@ describe Ohai::System, "plugin packages" do
     before(:each) do
       allow(plugin).to receive(:collect_os).and_return(:linux)
       allow(plugin).to receive(:shell_out)
-        .with("dpkg-query -W")
+        .with("dpkg-query -W -f='#{format}'")
         .and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
 
     it "calls dpkg query" do
       expect(plugin).to receive(:shell_out)
-        .with("dpkg-query -W")
+        .with("dpkg-query -W -f='#{format}'")
         .and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
@@ -58,7 +60,7 @@ describe Ohai::System, "plugin packages" do
       end
     end
 
-    let(:format) { Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n' }
+    let(:format) { '%{NAME}\t%|EPOCH?{%{EPOCH}}:{0}|\t%{VERSION}\t%{RELEASE}\t%{INSTALLTIME}\t%{ARCH}\n' }
 
     let(:stdout) do
       File.read(File.join(SPEC_PLUGIN_PATH, "rpmquery.output"))
@@ -66,20 +68,31 @@ describe Ohai::System, "plugin packages" do
 
     before(:each) do
       allow(plugin).to receive(:collect_os).and_return(:linux)
-      allow(plugin).to receive(:shell_out).with("rpm -qa --queryformat #{format}").and_return(mock_shell_out(0, stdout, ""))
+      allow(plugin).to receive(:shell_out).with("rpm -qa --qf '#{format}'").and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
 
     it "calls rpm -qa" do
       expect(plugin).to receive(:shell_out)
-        .with("rpm -qa --queryformat #{format}")
+        .with("rpm -qa --qf #{format}")
         .and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
 
-    it "gets packages and versions/release" do
-      expect(plugin[:packages]["vim-common"][:version]).to eq("7.2.411")
-      expect(plugin[:packages]["vim-common"][:release]).to eq("1.8.el6")
+    it "gets packages and versions/release - arch" do
+      expect(plugin[:packages]["glibc"][:version]).to eq("2.17")
+      expect(plugin[:packages]["glibc"][:release]).to eq("106.el7_2.6")
+      expect(plugin[:packages]["glibc"][:epoch]).to eq("0")
+      expect(plugin[:packages]["glibc"][:installdate]).to eq("1463486666")
+      expect(plugin[:packages]["glibc"][:arch]).to eq("x86_64")
+    end
+
+    it "gets packages and versions/release - noarch" do
+      expect(plugin[:packages]["tzdata"][:version]).to eq("2016d")
+      expect(plugin[:packages]["tzdata"][:release]).to eq("1.el7")
+      expect(plugin[:packages]["tzdata"][:epoch]).to eq("0")
+      expect(plugin[:packages]["tzdata"][:installdate]).to eq("1463486618")
+      expect(plugin[:packages]["tzdata"][:arch]).to eq("noarch")
     end
   end