Skip to content

Return an empty array of partitions on a non-zero rc from parted. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2013
Merged

Return an empty array of partitions on a non-zero rc from parted. #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/linux_admin/disk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ def partitions

# requires sudo
out = run(cmd(:parted),
:return_exitstatus => true,
:return_output => true,
:params => { nil => [@path, 'print'] })

return [] if out.kind_of?(Fixnum)

out.each_line do |l|
if l =~ /^ [0-9].*/
p = l.split
Expand Down
8 changes: 8 additions & 0 deletions spec/disk_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,19 @@
disk = LinuxAdmin::Disk.new :path => '/dev/hda'
disk.should_receive(:run).
with(disk.cmd(:parted),
:return_exitstatus => true,
:return_output => true,
:params => { nil => ['/dev/hda', 'print'] }).and_return ""
disk.partitions
end

it "returns [] on non-zero parted rc" do
disk = LinuxAdmin::Disk.new :path => '/dev/hda'
disk.stub(:exitstatus => 1)
disk.stub(:launch)
disk.partitions.should == []
end

it "sets partitons" do
partitions = <<eos
Model: ATA TOSHIBA MK5061GS (scsi)
Expand Down