spec/unit/data and spec/fixtures were both directories containing fixture data, but were arbitrarily separated. Consolidated the files.
Signed-off-by: Adrien Thebo <[email protected]> --- Local-branch: ticket/master/maint-consolidate-fixtures .../data => fixtures}/6.0-STABLE_FreeBSD_ifconfig | 0 .../data => fixtures}/Mac_OS_X_10.5.5_ifconfig | 0 .../darwin_ifconfig_all_with_multiple_interfaces | 0 .../darwin_ifconfig_single_interface | 0 .../data => fixtures}/debian_kfreebsd_ifconfig | 0 spec/{unit/data => fixtures}/freebsd_dmidecode | 0 .../hpux_ifconfig_single_interface | 0 .../data => fixtures}/hpux_netstat_all_interfaces | 0 .../data => fixtures}/linux_dmidecode_with_spaces | 0 .../linux_ifconfig_all_with_single_interface | 0 spec/{unit/data => fixtures}/linux_vlan_config | 0 spec/{unit/data => fixtures}/opensolaris_smbios | 0 spec/{unit/data => fixtures}/selinux_sestatus | 0 .../solaris_ifconfig_all_with_multiple_interfaces | 0 .../solaris_ifconfig_single_interface | 0 spec/{unit/data => fixtures}/xendomains | 0 spec/unit/selinux_spec.rb | 6 +- spec/unit/util/ip_spec.rb | 40 ++++++++++---------- spec/unit/util/manufacturer_spec.rb | 8 ++-- spec/unit/util/vlans_spec.rb | 2 +- spec/unit/util/xendomains_spec.rb | 2 +- 21 files changed, 29 insertions(+), 29 deletions(-) rename spec/{unit/data => fixtures}/6.0-STABLE_FreeBSD_ifconfig (100%) rename spec/{unit/data => fixtures}/Mac_OS_X_10.5.5_ifconfig (100%) rename spec/{unit/data => fixtures}/darwin_ifconfig_all_with_multiple_interfaces (100%) rename spec/{unit/data => fixtures}/darwin_ifconfig_single_interface (100%) rename spec/{unit/data => fixtures}/debian_kfreebsd_ifconfig (100%) rename spec/{unit/data => fixtures}/freebsd_dmidecode (100%) rename spec/{unit/data => fixtures}/hpux_ifconfig_single_interface (100%) rename spec/{unit/data => fixtures}/hpux_netstat_all_interfaces (100%) rename spec/{unit/data => fixtures}/linux_dmidecode_with_spaces (100%) rename spec/{unit/data => fixtures}/linux_ifconfig_all_with_single_interface (100%) rename spec/{unit/data => fixtures}/linux_vlan_config (100%) rename spec/{unit/data => fixtures}/opensolaris_smbios (100%) rename spec/{unit/data => fixtures}/selinux_sestatus (100%) rename spec/{unit/data => fixtures}/solaris_ifconfig_all_with_multiple_interfaces (100%) rename spec/{unit/data => fixtures}/solaris_ifconfig_single_interface (100%) rename spec/{unit/data => fixtures}/xendomains (100%) diff --git a/spec/unit/data/6.0-STABLE_FreeBSD_ifconfig b/spec/fixtures/6.0-STABLE_FreeBSD_ifconfig similarity index 100% rename from spec/unit/data/6.0-STABLE_FreeBSD_ifconfig rename to spec/fixtures/6.0-STABLE_FreeBSD_ifconfig diff --git a/spec/unit/data/Mac_OS_X_10.5.5_ifconfig b/spec/fixtures/Mac_OS_X_10.5.5_ifconfig similarity index 100% rename from spec/unit/data/Mac_OS_X_10.5.5_ifconfig rename to spec/fixtures/Mac_OS_X_10.5.5_ifconfig diff --git a/spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces b/spec/fixtures/darwin_ifconfig_all_with_multiple_interfaces similarity index 100% rename from spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces rename to spec/fixtures/darwin_ifconfig_all_with_multiple_interfaces diff --git a/spec/unit/data/darwin_ifconfig_single_interface b/spec/fixtures/darwin_ifconfig_single_interface similarity index 100% rename from spec/unit/data/darwin_ifconfig_single_interface rename to spec/fixtures/darwin_ifconfig_single_interface diff --git a/spec/unit/data/debian_kfreebsd_ifconfig b/spec/fixtures/debian_kfreebsd_ifconfig similarity index 100% rename from spec/unit/data/debian_kfreebsd_ifconfig rename to spec/fixtures/debian_kfreebsd_ifconfig diff --git a/spec/unit/data/freebsd_dmidecode b/spec/fixtures/freebsd_dmidecode similarity index 100% rename from spec/unit/data/freebsd_dmidecode rename to spec/fixtures/freebsd_dmidecode diff --git a/spec/unit/data/hpux_ifconfig_single_interface b/spec/fixtures/hpux_ifconfig_single_interface similarity index 100% rename from spec/unit/data/hpux_ifconfig_single_interface rename to spec/fixtures/hpux_ifconfig_single_interface diff --git a/spec/unit/data/hpux_netstat_all_interfaces b/spec/fixtures/hpux_netstat_all_interfaces similarity index 100% rename from spec/unit/data/hpux_netstat_all_interfaces rename to spec/fixtures/hpux_netstat_all_interfaces diff --git a/spec/unit/data/linux_dmidecode_with_spaces b/spec/fixtures/linux_dmidecode_with_spaces similarity index 100% rename from spec/unit/data/linux_dmidecode_with_spaces rename to spec/fixtures/linux_dmidecode_with_spaces diff --git a/spec/unit/data/linux_ifconfig_all_with_single_interface b/spec/fixtures/linux_ifconfig_all_with_single_interface similarity index 100% rename from spec/unit/data/linux_ifconfig_all_with_single_interface rename to spec/fixtures/linux_ifconfig_all_with_single_interface diff --git a/spec/unit/data/linux_vlan_config b/spec/fixtures/linux_vlan_config similarity index 100% rename from spec/unit/data/linux_vlan_config rename to spec/fixtures/linux_vlan_config diff --git a/spec/unit/data/opensolaris_smbios b/spec/fixtures/opensolaris_smbios similarity index 100% rename from spec/unit/data/opensolaris_smbios rename to spec/fixtures/opensolaris_smbios diff --git a/spec/unit/data/selinux_sestatus b/spec/fixtures/selinux_sestatus similarity index 100% rename from spec/unit/data/selinux_sestatus rename to spec/fixtures/selinux_sestatus diff --git a/spec/unit/data/solaris_ifconfig_all_with_multiple_interfaces b/spec/fixtures/solaris_ifconfig_all_with_multiple_interfaces similarity index 100% rename from spec/unit/data/solaris_ifconfig_all_with_multiple_interfaces rename to spec/fixtures/solaris_ifconfig_all_with_multiple_interfaces diff --git a/spec/unit/data/solaris_ifconfig_single_interface b/spec/fixtures/solaris_ifconfig_single_interface similarity index 100% rename from spec/unit/data/solaris_ifconfig_single_interface rename to spec/fixtures/solaris_ifconfig_single_interface diff --git a/spec/unit/data/xendomains b/spec/fixtures/xendomains similarity index 100% rename from spec/unit/data/xendomains rename to spec/fixtures/xendomains diff --git a/spec/unit/selinux_spec.rb b/spec/unit/selinux_spec.rb index d820958..e6c9b44 100755 --- a/spec/unit/selinux_spec.rb +++ b/spec/unit/selinux_spec.rb @@ -49,7 +49,7 @@ describe "SELinux facts" do it "should return the SELinux current mode" do Facter.fact(:selinux).stubs(:value).returns("true") - sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus' + sample_output_file = File.dirname(__FILE__) + '/../fixtures/selinux_sestatus' selinux_sestatus = File.read(sample_output_file) Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus) @@ -60,7 +60,7 @@ describe "SELinux facts" do it "should return the SELinux mode from the configuration file" do Facter.fact(:selinux).stubs(:value).returns("true") - sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus' + sample_output_file = File.dirname(__FILE__) + '/../fixtures/selinux_sestatus' selinux_sestatus = File.read(sample_output_file) Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus) @@ -71,7 +71,7 @@ describe "SELinux facts" do it "should return the SELinux configuration file policy" do Facter.fact(:selinux).stubs(:value).returns("true") - sample_output_file = File.dirname(__FILE__) + '/data/selinux_sestatus' + sample_output_file = File.dirname(__FILE__) + '/../fixtures/selinux_sestatus' selinux_sestatus = File.read(sample_output_file) Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/sestatus').returns(selinux_sestatus) diff --git a/spec/unit/util/ip_spec.rb b/spec/unit/util/ip_spec.rb index 0374e75..42e6826 100755 --- a/spec/unit/util/ip_spec.rb +++ b/spec/unit/util/ip_spec.rb @@ -21,35 +21,35 @@ describe Facter::Util::IP do end it "should return a list with a single interface and the loopback interface on Linux with a single interface" do - sample_output_file = File.dirname(__FILE__) + '/../data/linux_ifconfig_all_with_single_interface' + sample_output_file = File.dirname(__FILE__) + '/../../fixtures/linux_ifconfig_all_with_single_interface' linux_ifconfig = File.new(sample_output_file).read() Facter::Util::IP.stubs(:get_all_interface_output).returns(linux_ifconfig) Facter::Util::IP.get_interfaces().should == ["eth0", "lo"] end it "should return a list two interfaces on Darwin with two interfaces" do - sample_output_file = File.dirname(__FILE__) + '/../data/darwin_ifconfig_all_with_multiple_interfaces' + sample_output_file = File.dirname(__FILE__) + '/../../fixtures/darwin_ifconfig_all_with_multiple_interfaces' darwin_ifconfig = File.new(sample_output_file).read() Facter::Util::IP.stubs(:get_all_interface_output).returns(darwin_ifconfig) Facter::Util::IP.get_interfaces().should == ["lo0", "en0"] end it "should return a list two interfaces on Solaris with two interfaces multiply reporting" do - sample_output_file = File.dirname(__FILE__) + '/../data/solaris_ifconfig_all_with_multiple_interfaces' + sample_output_file = File.dirname(__FILE__) + '/../../fixtures/solaris_ifconfig_all_with_multiple_interfaces' solaris_ifconfig = File.new(sample_output_file).read() Facter::Util::IP.stubs(:get_all_interface_output).returns(solaris_ifconfig) Facter::Util::IP.get_interfaces().should == ["lo0", "e1000g0"] end it "should return a list three interfaces on HP-UX with three interfaces multiply reporting" do - sample_output_file = File.dirname(__FILE__) + '/../data/hpux_netstat_all_interfaces' + sample_output_file = File.dirname(__FILE__) + '/../../fixtures/hpux_netstat_all_interfaces' hpux_netstat = File.new(sample_output_file).read() Facter::Util::IP.stubs(:get_all_interface_output).returns(hpux_netstat) Facter::Util::IP.get_interfaces().should == ["lan1", "lan0", "lo0"] end it "should return a list of six interfaces on a GNU/kFreeBSD with six interfaces" do - sample_output_file = File.dirname(__FILE__) + '/../data/debian_kfreebsd_ifconfig' + sample_output_file = File.dirname(__FILE__) + '/../../fixtures/debian_kfreebsd_ifconfig' kfreebsd_ifconfig = File.new(sample_output_file).read() Facter::Util::IP.stubs(:get_all_interface_output).returns(kfreebsd_ifconfig) Facter::Util::IP.get_interfaces().should == ["em0", "em1", "bge0", "bge1", "lo0", "vlan0"] @@ -65,7 +65,7 @@ describe Facter::Util::IP do end it "should return ipaddress information for Solaris" do - sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/solaris_ifconfig_single_interface" solaris_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface) @@ -75,7 +75,7 @@ describe Facter::Util::IP do end it "should return netmask information for Solaris" do - sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/solaris_ifconfig_single_interface" solaris_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface) @@ -85,7 +85,7 @@ describe Facter::Util::IP do end it "should return calculated network information for Solaris" do - sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/solaris_ifconfig_single_interface" solaris_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.stubs(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface) @@ -95,7 +95,7 @@ describe Facter::Util::IP do end it "should return ipaddress information for HP-UX" do - sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/hpux_ifconfig_single_interface" hpux_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface) @@ -105,7 +105,7 @@ describe Facter::Util::IP do end it "should return macaddress information for HP-UX" do - sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/hpux_ifconfig_single_interface" hpux_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface) @@ -115,7 +115,7 @@ describe Facter::Util::IP do end it "should return macaddress with leading zeros stripped off for GNU/kFreeBSD" do - sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/debian_kfreebsd_ifconfig" kfreebsd_ifconfig = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("em0").returns(kfreebsd_ifconfig) @@ -125,7 +125,7 @@ describe Facter::Util::IP do end it "should return netmask information for HP-UX" do - sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/hpux_ifconfig_single_interface" hpux_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface) @@ -135,7 +135,7 @@ describe Facter::Util::IP do end it "should return calculated network information for HP-UX" do - sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/hpux_ifconfig_single_interface" hpux_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.stubs(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface) @@ -145,7 +145,7 @@ describe Facter::Util::IP do end it "should return interface information for FreeBSD supported via an alias" do - sample_output_file = File.dirname(__FILE__) + "/../data/6.0-STABLE_FreeBSD_ifconfig" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/6.0-STABLE_FreeBSD_ifconfig" ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("fxp0").returns(ifconfig_interface) @@ -155,7 +155,7 @@ describe Facter::Util::IP do end it "should return macaddress information for OS X" do - sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/Mac_OS_X_10.5.5_ifconfig" ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("en1").returns(ifconfig_interface) @@ -165,7 +165,7 @@ describe Facter::Util::IP do end it "should return all interfaces correctly on OS X" do - sample_output_file = File.dirname(__FILE__) + "/../data/Mac_OS_X_10.5.5_ifconfig" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/Mac_OS_X_10.5.5_ifconfig" ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_all_interface_output).returns(ifconfig_interface) @@ -175,7 +175,7 @@ describe Facter::Util::IP do end it "should return a human readable netmask on Solaris" do - sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/solaris_ifconfig_single_interface" solaris_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface) @@ -185,7 +185,7 @@ describe Facter::Util::IP do end it "should return a human readable netmask on HP-UX" do - sample_output_file = File.dirname(__FILE__) + "/../data/hpux_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/hpux_ifconfig_single_interface" hpux_ifconfig_interface = File.new(sample_output_file).read() Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface) @@ -195,7 +195,7 @@ describe Facter::Util::IP do end it "should return a human readable netmask on Darwin" do - sample_output_file = File.dirname(__FILE__) + "/../data/darwin_ifconfig_single_interface" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/darwin_ifconfig_single_interface" darwin_ifconfig_interface = File.new(sample_output_file).read() @@ -206,7 +206,7 @@ describe Facter::Util::IP do end it "should return a human readable netmask on GNU/kFreeBSD" do - sample_output_file = File.dirname(__FILE__) + "/../data/debian_kfreebsd_ifconfig" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/debian_kfreebsd_ifconfig" kfreebsd_ifconfig = File.new(sample_output_file).read() diff --git a/spec/unit/util/manufacturer_spec.rb b/spec/unit/util/manufacturer_spec.rb index c3b372e..e9df6cf 100644 --- a/spec/unit/util/manufacturer_spec.rb +++ b/spec/unit/util/manufacturer_spec.rb @@ -24,7 +24,7 @@ describe Facter::Manufacturer do end it "should strip white space on dmi output with spaces" do - sample_output_file = File.dirname(__FILE__) + "/../data/linux_dmidecode_with_spaces" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/linux_dmidecode_with_spaces" dmidecode_output = File.new(sample_output_file).read() Facter::Manufacturer.expects(:get_dmi_table).returns(dmidecode_output) Facter.fact(:kernel).stubs(:value).returns("Linux") @@ -36,7 +36,7 @@ describe Facter::Manufacturer do end it "should handle output from smbios when run under sunos" do - sample_output_file = File.dirname(__FILE__) + "/../data/opensolaris_smbios" + sample_output_file = File.dirname(__FILE__) + "/../../fixtures/opensolaris_smbios" smbios_output = File.new(sample_output_file).read() Facter::Manufacturer.expects(:get_dmi_table).returns(smbios_output) Facter.fact(:kernel).stubs(:value).returns("SunOS") @@ -109,8 +109,8 @@ Handle 0x001F def find_product_name(os) output_file = case os - when "FreeBSD" then File.dirname(__FILE__) + "/../data/freebsd_dmidecode" - when "SunOS" then File.dirname(__FILE__) + "/../data/opensolaris_smbios" + when "FreeBSD" then File.dirname(__FILE__) + "/../../fixtures/freebsd_dmidecode" + when "SunOS" then File.dirname(__FILE__) + "/../../fixtures/opensolaris_smbios" end output = File.new(output_file).read() diff --git a/spec/unit/util/vlans_spec.rb b/spec/unit/util/vlans_spec.rb index 0331234..4b47d06 100755 --- a/spec/unit/util/vlans_spec.rb +++ b/spec/unit/util/vlans_spec.rb @@ -6,7 +6,7 @@ require 'facter/util/vlans' describe Facter::Util::Vlans do it "should return a list of vlans on Linux" do - sample_output_file = File.dirname(__FILE__) + '/../data/linux_vlan_config' + sample_output_file = File.dirname(__FILE__) + '/../../fixtures/linux_vlan_config' linux_vlanconfig = File.new(sample_output_file).read(); Facter::Util::Vlans.stubs(:get_vlan_config).returns(linux_vlanconfig) Facter::Util::Vlans.get_vlans().should == %{400,300,200,100} diff --git a/spec/unit/util/xendomains_spec.rb b/spec/unit/util/xendomains_spec.rb index 5562d26..417eacd 100755 --- a/spec/unit/util/xendomains_spec.rb +++ b/spec/unit/util/xendomains_spec.rb @@ -7,7 +7,7 @@ require 'facter/util/xendomains' describe Facter::Util::Xendomains do describe ".get_domains" do it "should return a list of running Xen Domains on Xen0" do - sample_output_file = File.dirname(__FILE__) + '/../data/xendomains' + sample_output_file = File.dirname(__FILE__) + '/../../fixtures/xendomains' xen0_domains = File.read(sample_output_file) Facter::Util::Resolution.stubs(:exec).with('/usr/sbin/xm list 2>/dev/null').returns(xen0_domains) Facter::Util::Xendomains.get_domains.should == %{web01,mailserver} -- 1.7.4.1 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
