diff --git a/Makefile b/Makefile index 42eec0b..4cabf57 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,7 @@ deb: cd $(CURDIR); \ git checkout debian; \ cp -r debian $(DEBPACKAGEDIR); \ + rm -f $(DEBPACKAGEDIR)/debian/.gitignore; \ git checkout master) $(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME) diff --git a/tests/archives/test_lzop.py b/tests/archives/test_lzop.py index 81689e5..d092ebc 100644 --- a/tests/archives/test_lzop.py +++ b/tests/archives/test_lzop.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 Bastian Kleineidam +# Copyright (C) 2010-2013 Bastian Kleineidam # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from . import ArchiveTest +from . import ArchiveTest, Content from .. import needs_program class TestLzop (ArchiveTest): @@ -22,10 +22,10 @@ class TestLzop (ArchiveTest): @needs_program(program) def test_lzop(self): - self.archive_commands('t.lzo', singlefile=True) + self.archive_commands('t.txt.lzo', check=Content.Singlefile) @needs_program('file') @needs_program(program) def test_lzop_file(self): - self.archive_commands('t.lzo.foo', skip_create=True) + self.archive_commands('t.txt.lzo.foo', skip_create=True, check=Content.Singlefile) diff --git a/tests/data/t.lzo b/tests/data/t.lzo deleted file mode 100644 index 100be4d..0000000 Binary files a/tests/data/t.lzo and /dev/null differ diff --git a/tests/data/t.lzo.foo b/tests/data/t.lzo.foo deleted file mode 100644 index 100be4d..0000000 Binary files a/tests/data/t.lzo.foo and /dev/null differ diff --git a/tests/data/t.txt.lzo b/tests/data/t.txt.lzo new file mode 100644 index 0000000..a4b393b Binary files /dev/null and b/tests/data/t.txt.lzo differ diff --git a/tests/data/t.txt.lzo.foo b/tests/data/t.txt.lzo.foo new file mode 100644 index 0000000..a4b393b Binary files /dev/null and b/tests/data/t.txt.lzo.foo differ diff --git a/tests/test_mime.py b/tests/test_mime.py index 3c257a0..2d32ed4 100644 --- a/tests/test_mime.py +++ b/tests/test_mime.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 Bastian Kleineidam +# Copyright (C) 2010-2013 Bastian Kleineidam # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -66,8 +66,8 @@ class TestMime (unittest.TestCase): #self.mime_test_file("t.lzma.foo", "application/x-lzma", None) self.mime_test_file("t.txt.lz", "application/x-lzip", None) self.mime_test_file("t.txt.lz.foo", "application/x-lzip", None) - self.mime_test_file("t.lzo", "application/x-lzop", None) - self.mime_test_file("t.lzo.foo", "application/x-lzop", None) + self.mime_test_file("t.txt.lzo", "application/x-lzop", None) + self.mime_test_file("t.txt.lzo.foo", "application/x-lzop", None) self.mime_test_file("t.rar", "application/x-rar", None) self.mime_test_file("t.rar.foo", "application/x-rar", None) self.mime_test_file("t.rpm", "application/x-rpm", None)