gryf/fs-uae-wrapper
1
0
Fork 0
mirror of https://github.com/gryf/fs-uae-wrapper.git synced 2025-12-19 04:20:23 +01:00
Code Issues Projects Releases Wiki Activity

Non existed archive will not be fatal

Browse Source 
Moved logic which check for archive file explicitly to extract method.
That way get_archiver will return archiver for not (yet) existed
archives.
This commit is contained in:
gryf
2017-01-02 13:08:34 +01:00
parent 252c013fc4
commit 251fab377b
2 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/test_file_archive.py
View File

@@ -1,7 +1,6 @@
import os
import sys
import shutil
from tempfile import mkstemp, mkdtemp
from tempfile import mkdtemp
from unittest import TestCase
try:
@@ -10,7 +9,6 @@ except ImportError:
import mock
from fs_uae_wrapper import file_archive
from fs_uae_wrapper import utils
class TestArchive(TestCase):
@@ -30,10 +28,6 @@ class TestArchive(TestCase):
def test_get_archiver(self):
arch = file_archive.get_archiver('foobarbaz.cab')
self.assertIsNone(arch)
with open('foobarbaz.cab', 'w') as fobj:
fobj.write('\n')
arch = file_archive.get_archiver('foobarbaz.cab')
self.assertIsNone(arch)
with open('foobarbaz.tar', 'w') as fobj:
fobj.write('\n')
@@ -56,6 +50,8 @@ class TestArchive(TestCase):
call.reset_mock()
call.return_value = 1
with open('foo', 'w') as fobj:
fobj.write('\n')
self.assertFalse(arch.extract('foo'))
call.assert_called_once_with(['false', 'x', 'foo'])
@@ -78,6 +74,9 @@ class TestArchive(TestCase):
@mock.patch('fs_uae_wrapper.file_archive.Archive.which')
@mock.patch('subprocess.call')
def test_tar(self, call, which):
with open('foo', 'w') as fobj:
fobj.write('\n')
arch = file_archive.TarArchive()
arch.archiver = 'tar'
call.return_value = 0
@@ -129,6 +128,9 @@ class TestArchive(TestCase):
@mock.patch('fs_uae_wrapper.file_archive.Archive.which')
@mock.patch('subprocess.call')
def test_lha(self, call, which):
with open('foo', 'w') as fobj:
fobj.write('\n')
arch = file_archive.LhaArchive()
arch.archiver = 'lha'
call.return_value = 0
@@ -144,6 +146,9 @@ class TestArchive(TestCase):
@mock.patch('fs_uae_wrapper.file_archive.Archive.which')
@mock.patch('subprocess.call')
def test_lzx(self, call, which):
with open('foo', 'w') as fobj:
fobj.write('\n')
arch = file_archive.LzxArchive()
arch.archiver = 'unlzx'
call.return_value = 0
@@ -159,6 +164,9 @@ class TestArchive(TestCase):
@mock.patch('fs_uae_wrapper.file_archive.Archive.which')
@mock.patch('subprocess.call')
def test_7zip(self, call, which):
with open('foo', 'w') as fobj:
fobj.write('\n')
arch = file_archive.SevenZArchive()
arch.archiver = '7z'
call.return_value = 0
@@ -174,6 +182,9 @@ class TestArchive(TestCase):
@mock.patch('fs_uae_wrapper.file_archive.Archive.which')
@mock.patch('subprocess.call')
def test_zip(self, call, which):
with open('foo', 'w') as fobj:
fobj.write('\n')
arch = file_archive.ZipArchive()
arch.archiver = '7z'
call.return_value = 0
@@ -189,6 +200,7 @@ class TestArchive(TestCase):
@mock.patch('fs_uae_wrapper.file_archive.Archive.which')
@mock.patch('subprocess.call')
def test_rar(self, call, which):
arch = file_archive.RarArchive()
arch.archiver = 'rar'
call.return_value = 0
@@ -206,6 +218,8 @@ class TestArchive(TestCase):
self.assertTrue(arch.create('foo.rar'))
call.assert_called_once_with(['rar', 'a', 'foo.rar', 'bar', 'baz',
'directory', 'foo'])
with open('foo', 'w') as fobj:
fobj.write('\n')
call.reset_mock()
call.return_value = 1