Remove lots of redundant test runs from the test suite
The test suite used to run a lot of triple tests, by first calling archivemail.archive() directly, and then running the entire archivemail script twice, once with long and once with short options. But we already test option processing seperately, and beyond that, archivemail.main() essentially just calls archive() for each mailbox in turn. So we just drop all runs of the entire archivemail script from the test suite, giving it a huge speed boost (on my old iBook, running the test suite drops from 73 to 5 seconds).
This commit is contained in:
Nikolaus Schulz
parent
8f58deef5c
commit
8476dcd18f
|
|
@ -479,24 +479,17 @@ class TestArchiveMbox(TestCaseInTempdir):
|
|||
mbox_name = None
|
||||
|
||||
def setUp(self):
|
||||
self.oldopts = copy.copy(archivemail.options)
|
||||
archivemail.options.quiet = 1
|
||||
super(TestArchiveMbox, self).setUp()
|
||||
|
||||
|
||||
def testOld(self):
|
||||
"""archiving an old mailbox"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
new_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
|
|
@ -541,61 +534,45 @@ This is after the ^From line"""
|
|||
},
|
||||
)
|
||||
for headers in test_headers:
|
||||
for option in ('--date=2000-07-29', '-D2000-07-29',
|
||||
'--date="29 Jul 2000"', '--date="29 July 2000"'):
|
||||
date = time.strptime("2000-07-29", "%Y-%m-%d")
|
||||
archivemail.options.date_old_max = time.mktime(date)
|
||||
self.mbox_name = make_mbox(messages=3, headers=headers)
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
run = "./archivemail.py -q %s %s" % (option, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
archivemail.archive(self.mbox_name)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assertEqualContent(archive_name, self.copy_name, zipfirst=True)
|
||||
for option in ('--date=2000-07-27', '-D2000-07-27',
|
||||
'--date="27 Jul 2000"', '--date="27 July 2000"'):
|
||||
date = time.strptime("2000-07-27", "%Y-%m-%d")
|
||||
archivemail.options.date_old_max = time.mktime(date)
|
||||
self.mbox_name = make_mbox(messages=3, headers=headers)
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
run = "./archivemail.py -q %s %s" % (option, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
archivemail.archive(self.mbox_name)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
||||
def testMixed(self):
|
||||
"""archiving a mixed mailbox"""
|
||||
for execute in ("package", "system"):
|
||||
self.new_mbox = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.old_mbox = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.new_mbox, self.mbox_name)
|
||||
append_file(self.old_mbox, self.mbox_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.new_mbox)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assertEqualContent(archive_name, self.old_mbox, zipfirst=True)
|
||||
|
||||
def testNew(self):
|
||||
"""archiving a new mailbox"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.mbox_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
new_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.assertEqual(self.mbox_mode, new_mode)
|
||||
|
|
@ -605,7 +582,6 @@ This is after the ^From line"""
|
|||
|
||||
def testOldExisting(self):
|
||||
"""archiving an old mailbox with an existing archive"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
|
|
@ -617,13 +593,7 @@ This is after the ^From line"""
|
|||
fp2.close()
|
||||
fp1.close()
|
||||
append_file(self.mbox_name, self.copy_name) # copy now has 6 msgs
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
new_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
|
|
@ -682,7 +652,7 @@ This is after the ^From line"""
|
|||
assertEqualContent(archive_name, self.copy_name, zipfirst=True)
|
||||
|
||||
def tearDown(self):
|
||||
archivemail.options.quiet = 0
|
||||
archivemail.options = self.oldopts
|
||||
super(TestArchiveMbox, self).tearDown()
|
||||
|
||||
|
||||
|
|
@ -694,18 +664,11 @@ class TestArchiveMboxTimestamp(TestCaseInTempdir):
|
|||
|
||||
def testNew(self):
|
||||
"""mbox timestamps should not change after no archival"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.mtime = os.path.getmtime(self.mbox_name) - 66
|
||||
self.atime = os.path.getatime(self.mbox_name) - 88
|
||||
os.utime(self.mbox_name, (self.atime, self.mtime))
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
new_atime = os.path.getatime(self.mbox_name)
|
||||
new_mtime = os.path.getmtime(self.mbox_name)
|
||||
|
|
@ -714,19 +677,12 @@ class TestArchiveMboxTimestamp(TestCaseInTempdir):
|
|||
|
||||
def testMixed(self):
|
||||
"""mbox timestamps should not change after semi-archival"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mtime = os.path.getmtime(self.mbox_name) - 66
|
||||
self.atime = os.path.getatime(self.mbox_name) - 88
|
||||
os.utime(self.mbox_name, (self.atime, self.mtime))
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
new_atime = os.path.getatime(self.mbox_name)
|
||||
new_mtime = os.path.getmtime(self.mbox_name)
|
||||
|
|
@ -735,19 +691,12 @@ class TestArchiveMboxTimestamp(TestCaseInTempdir):
|
|||
|
||||
def testOld(self):
|
||||
"""mbox timestamps should not change after archival"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mtime = os.path.getmtime(self.mbox_name) - 66
|
||||
self.atime = os.path.getatime(self.mbox_name) - 88
|
||||
os.utime(self.mbox_name, (self.atime, self.mtime))
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
new_atime = os.path.getatime(self.mbox_name)
|
||||
new_mtime = os.path.getmtime(self.mbox_name)
|
||||
|
|
@ -767,18 +716,11 @@ class TestArchiveMboxAll(TestCaseInTempdir):
|
|||
|
||||
def testNew(self):
|
||||
"""archiving --all messages in a new mailbox"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.mbox_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --all --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
new_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
|
|
@ -804,22 +746,11 @@ class TestArchiveMboxPreserveStatus(TestCaseInTempdir):
|
|||
|
||||
def testOldRead(self):
|
||||
"""archiving an old read mailbox should create an archive"""
|
||||
for execute in ("package", "system_long", "system_short"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181), \
|
||||
headers={"Status":"RO"})
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --preserve-unread --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_short":
|
||||
run = "./archivemail.py -u --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
|
|
@ -827,21 +758,10 @@ class TestArchiveMboxPreserveStatus(TestCaseInTempdir):
|
|||
|
||||
def testOldUnread(self):
|
||||
"""archiving an unread mailbox should not create an archive"""
|
||||
for execute in ("package", "system_long", "system_short"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --preserve-unread --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_short":
|
||||
run = "./archivemail.py -u --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
|
@ -861,25 +781,13 @@ class TestArchiveMboxSuffix(TestCaseInTempdir):
|
|||
def testSuffix(self):
|
||||
"""archiving with specified --suffix arguments"""
|
||||
for suffix in ("_static_", "_%B_%Y", "-%Y-%m-%d"):
|
||||
for execute in ("system_long", "system_short", "package"):
|
||||
days_old_max = 180
|
||||
self.mbox_name = make_mbox(messages=3,
|
||||
hours_old=(24 * (days_old_max+1)))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "system_long":
|
||||
run = "./archivemail.py --quiet --suffix='%s' %s" % \
|
||||
(suffix, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_short":
|
||||
run = "./archivemail.py --quiet -s'%s' %s" % \
|
||||
(suffix, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "package":
|
||||
archivemail.options.archive_suffix = suffix
|
||||
archivemail.archive(self.mbox_name)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
|
||||
|
|
@ -906,20 +814,10 @@ class TestArchiveDryRun(TestCaseInTempdir):
|
|||
|
||||
def testOld(self):
|
||||
"""archiving an old mailbox with the 'dry-run' option"""
|
||||
for execute in ("package", "system_long", "system_short"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --dry-run --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_short":
|
||||
run = "./archivemail.py -n --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
|
@ -938,21 +836,11 @@ class TestArchiveDays(TestCaseInTempdir):
|
|||
|
||||
def testOld(self):
|
||||
"""specifying the 'days' option on an older mailbox"""
|
||||
for execute in ("package", "system", "system_long"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 12))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.options.days_old_max = 11
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py -d11 --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --days=11 --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
|
|
@ -960,21 +848,11 @@ class TestArchiveDays(TestCaseInTempdir):
|
|||
|
||||
def testNew(self):
|
||||
"""specifying the 'days' option on a newer mailbox"""
|
||||
for execute in ("package", "system", "system_long"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 10))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.options.days_old_max = 11
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py -d11 --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --days=11 --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
|
@ -999,53 +877,32 @@ class TestArchiveDelete(TestCaseInTempdir):
|
|||
|
||||
def testNew(self):
|
||||
"""archiving a new mailbox with the 'delete' option"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --delete --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
||||
def testMixed(self):
|
||||
"""archiving a mixed mailbox with the 'delete' option"""
|
||||
for execute in ("package", "system"):
|
||||
self.new_mbox = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.old_mbox = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.new_mbox, self.mbox_name)
|
||||
append_file(self.old_mbox, self.mbox_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --delete --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.new_mbox)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
||||
def testOld(self):
|
||||
"""archiving an old mailbox with the 'delete' option"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --delete --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
|
|
@ -1071,24 +928,17 @@ class TestArchiveCopy(TestCaseInTempdir):
|
|||
|
||||
def testNew(self):
|
||||
"""archiving a new mailbox with the 'copy' option"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.mbox_backup_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.mbox_backup_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --copy --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.mbox_backup_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
self.tearDown()
|
||||
|
||||
def testMixed(self):
|
||||
"""archiving a mixed mailbox with the 'copy' option"""
|
||||
for execute in ("package", "system"):
|
||||
self.new_mbox = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.old_mbox = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_name = tempfile.mkstemp()[1]
|
||||
|
|
@ -1096,30 +946,17 @@ class TestArchiveCopy(TestCaseInTempdir):
|
|||
append_file(self.old_mbox, self.mbox_name)
|
||||
self.mbox_backup_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.mbox_backup_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --copy --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.mbox_backup_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assertEqualContent(archive_name, self.old_mbox, zipfirst=True)
|
||||
|
||||
def testOld(self):
|
||||
"""archiving an old mailbox with the 'copy' option"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_backup_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.mbox_backup_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --copy --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.mbox_backup_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assertEqualContent(archive_name, self.mbox_name, zipfirst=True)
|
||||
|
|
@ -1134,63 +971,40 @@ class TestArchiveMboxFlagged(TestCaseInTempdir):
|
|||
"""make sure the 'include_flagged' option works"""
|
||||
def setUp(self):
|
||||
super(TestArchiveMboxFlagged, self).setUp()
|
||||
archivemail.options.include_flagged = 0
|
||||
archivemail.options.quiet = 1
|
||||
|
||||
def testOld(self):
|
||||
"""by default, old flagged messages should not be archived"""
|
||||
for execute in ("system", "package"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181), \
|
||||
headers={"X-Status":"F"})
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.options.include_flagged = 0
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
||||
def testIncludeFlaggedNew(self):
|
||||
"""new flagged messages should not be archived with include_flagged"""
|
||||
for execute in ("system", "package"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 179), \
|
||||
headers={"X-Status":"F"})
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.options.include_flagged = 1
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --include-flagged --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
||||
def testIncludeFlaggedOld(self):
|
||||
"""old flagged messages should be archived with include_flagged"""
|
||||
for execute in ("system", "package"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181), \
|
||||
headers={"X-Status":"F"})
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.options.include_flagged = 1
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --include-flagged --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
|
|
@ -1210,24 +1024,12 @@ class TestArchiveMboxOutputDir(TestCaseInTempdir):
|
|||
|
||||
def testOld(self):
|
||||
"""archiving an old mailbox with a sepecified output dir"""
|
||||
for execute in ("package", "system_long", "system_short"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
self.dir_name = tempfile.mkdtemp()
|
||||
if execute == "package":
|
||||
archivemail.options.output_dir = self.dir_name
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --output-dir=%s --quiet %s" % \
|
||||
(self.dir_name, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_short":
|
||||
run = "./archivemail.py -o%s --quiet %s" % \
|
||||
(self.dir_name, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
archive_name = self.dir_name + "/" + \
|
||||
|
|
@ -1254,19 +1056,11 @@ class TestArchiveMboxUncompressed(TestCaseInTempdir):
|
|||
|
||||
def testOld(self):
|
||||
"""archiving an old mailbox uncompressed"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --no-compress --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
new_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
|
|
@ -1277,19 +1071,11 @@ class TestArchiveMboxUncompressed(TestCaseInTempdir):
|
|||
|
||||
def testNew(self):
|
||||
"""archiving a new mailbox uncompressed"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.mbox_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --no-compress --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
new_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.assertEqual(self.mbox_mode, new_mode)
|
||||
|
|
@ -1299,20 +1085,12 @@ class TestArchiveMboxUncompressed(TestCaseInTempdir):
|
|||
|
||||
def testMixed(self):
|
||||
"""archiving a mixed mailbox uncompressed"""
|
||||
for execute in ("package", "system"):
|
||||
self.new_mbox = make_mbox(messages=3, hours_old=(24 * 179))
|
||||
self.old_mbox = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.new_mbox, self.mbox_name)
|
||||
append_file(self.old_mbox, self.mbox_name)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --no-compress --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.new_mbox)
|
||||
archive_name = self.mbox_name + "_archive"
|
||||
assertEqualContent(archive_name, self.old_mbox)
|
||||
|
|
@ -1320,7 +1098,6 @@ class TestArchiveMboxUncompressed(TestCaseInTempdir):
|
|||
|
||||
def testOldExists(self):
|
||||
"""archiving an old mailbox uncopressed with an existing archive"""
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=3, hours_old=(24 * 181))
|
||||
self.mbox_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
|
|
@ -1328,14 +1105,7 @@ class TestArchiveMboxUncompressed(TestCaseInTempdir):
|
|||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
shutil.copyfile(self.mbox_name, archive_name) # archive has 3 msgs
|
||||
append_file(self.mbox_name, self.copy_name) # copy now has 6 msgs
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --no-compress --quiet %s" % \
|
||||
self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
new_mode = os.stat(self.mbox_name)[stat.ST_MODE]
|
||||
|
|
@ -1358,24 +1128,12 @@ class TestArchiveSize(TestCaseInTempdir):
|
|||
|
||||
def testSmaller(self):
|
||||
"""giving a size argument smaller than the message"""
|
||||
for execute in ("package", "system_long", "system_short"):
|
||||
self.mbox_name = make_mbox(messages=1, hours_old=(24 * 181))
|
||||
size_arg = os.path.getsize(self.mbox_name) - 1
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.options.min_size = size_arg
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --size=%d --quiet %s" % \
|
||||
(size_arg, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_short":
|
||||
run = "./archivemail.py -S%d --quiet %s" % \
|
||||
(size_arg, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
self.assertEqual(os.path.getsize(self.mbox_name), 0)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
|
|
@ -1383,24 +1141,12 @@ class TestArchiveSize(TestCaseInTempdir):
|
|||
|
||||
def testBigger(self):
|
||||
"""giving a size argument bigger than the message"""
|
||||
for execute in ("package", "system_long", "system_short"):
|
||||
self.mbox_name = make_mbox(messages=1, hours_old=(24 * 181))
|
||||
size_arg = os.path.getsize(self.mbox_name) + 1
|
||||
self.copy_name = tempfile.mkstemp()[1]
|
||||
shutil.copyfile(self.mbox_name, self.copy_name)
|
||||
if execute == "package":
|
||||
archivemail.options.min_size = size_arg
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system_long":
|
||||
run = "./archivemail.py --size=%d --quiet %s" % \
|
||||
(size_arg, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
elif execute == "system_short":
|
||||
run = "./archivemail.py -S%d --quiet %s" % \
|
||||
(size_arg, self.mbox_name)
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
assertEqualContent(self.mbox_name, self.copy_name)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
|
|
@ -1420,16 +1166,9 @@ class TestArchiveMboxMode(TestCaseInTempdir):
|
|||
def testOld(self):
|
||||
"""after archiving, the original mbox mode should be preserved"""
|
||||
for mode in (0666, 0664, 0660, 0640, 0600):
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=1, hours_old=(24 * 181))
|
||||
os.chmod(self.mbox_name, mode)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
assert(os.path.exists(archive_name))
|
||||
|
|
@ -1441,16 +1180,9 @@ class TestArchiveMboxMode(TestCaseInTempdir):
|
|||
def testNew(self):
|
||||
"""after no archiving, the original mbox mode should be preserved"""
|
||||
for mode in (0666, 0664, 0660, 0640, 0600):
|
||||
for execute in ("package", "system"):
|
||||
self.mbox_name = make_mbox(messages=1, hours_old=(24 * 179))
|
||||
os.chmod(self.mbox_name, mode)
|
||||
if execute == "package":
|
||||
archivemail.archive(self.mbox_name)
|
||||
elif execute == "system":
|
||||
run = "./archivemail.py --quiet %s" % self.mbox_name
|
||||
self.assertEqual(os.system(run), 0)
|
||||
else:
|
||||
sys.exit(1)
|
||||
archive_name = self.mbox_name + "_archive.gz"
|
||||
assert(not os.path.exists(archive_name))
|
||||
assert(os.path.exists(self.mbox_name))
|
||||
|
|
|
|||
Loading…
Reference in New Issue