summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2013-09-25 14:09:20 +0000
committerTails developers <tails@boum.org>2013-09-25 14:26:18 +0000
commit73143aef1ae0beefdeb7c597b2f0ac0026610ec8 (patch)
treecc9817b6929de976e81f6f36acff2325f26b24cd /tests
parent43adb7c758a80365cd83d1cca87fc7c08c1d6f1a (diff)
Fix method name and documentation + error messages to match actual program behavior.
liveusb-creator hasn't paid attention to the `removable' property since early 2009 (363f20f11b2fc2a5d2d06cba5872726711b66e95), so let's avoid confusing ourselves in the future. Also mention we now support SDIO too.
Diffstat (limited to 'tests')
-rw-r--r--tests/test_creator.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_creator.py b/tests/test_creator.py
index dcbe8ff..4be51e5 100644
--- a/tests/test_creator.py
+++ b/tests/test_creator.py
@@ -22,7 +22,7 @@ class TestLiveUSBCreator:
def test_device_detection(self):
live = self._get_creator()
- live.detect_removable_drives()
+ live.detect_supported_drives()
assert len(live.drives), "No devices found"
for drive in live.drives:
for key in ('label', 'fstype', 'uuid', 'free'):
@@ -41,7 +41,7 @@ class TestLiveUSBCreator:
def test_mount_device(self):
live = self._get_creator()
- live.detect_removable_drives()
+ live.detect_supported_drives()
for drive in live.drives:
live.drive = drive
if live.drive['mount']:
@@ -62,7 +62,7 @@ class TestLiveUSBCreator:
def test_unmount_device(self):
live = self._get_creator()
- live.detect_removable_drives()
+ live.detect_supported_drives()
for drive in live.drives:
live.drive = drive
if live.drive['mount']:
@@ -80,7 +80,7 @@ class TestLiveUSBCreator:
def test_verify_filesystem(self):
live = self._get_creator()
- live.detect_removable_drives()
+ live.detect_supported_drives()
for drive in live.drives:
live.drive = drive
assert live.fstype
@@ -92,7 +92,7 @@ class TestLiveUSBCreator:
from glob import glob
from liveusb.source import LocalIsoSource
live = self._get_creator()
- live.detect_removable_drives()
+ live.detect_supported_drives()
isos = filter(lambda x: x.endswith('.iso'),
filter(os.path.isfile, glob('*') + glob('*/*')))
assert isos, "No ISOs found. Put one in this directory"
@@ -119,7 +119,7 @@ class TestLiveUSBCreator:
def test_mbr(self):
""" Ensure that we can properly detect and reset a blank MBR """
live = self._get_creator()
- live.detect_removable_drives()
+ live.detect_supported_drives()
for drive in live.drives:
live.drive = drive