--- test_archivemail.py 2007-11-08 10:17:39.000000000 -0600 +++ test_archivemail.py 2007-11-08 10:22:05.000000000 -0600 @@ -30,6 +30,8 @@ """ +ARCHIVEMAIL_DATADIR = './' + import sys def check_python_version(): @@ -60,6 +62,7 @@ import unittest try: + sys.path.insert(0, ARCHIVEMAIL_DATADIR) import archivemail except ImportError: print "The archivemail script needs to be called 'archivemail.py'" @@ -432,7 +435,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -495,7 +498,7 @@ 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) + run = "python archivemail.py -q %s %s" % (option, self.mbox_name) self.assertEqual(os.system(run), 0) assert(os.path.exists(self.mbox_name)) self.assertEqual(os.path.getsize(self.mbox_name), 0) @@ -512,7 +515,7 @@ 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) + run = "python archivemail.py -q %s %s" % (option, self.mbox_name) self.assertEqual(os.system(run), 0) assert(os.path.exists(self.mbox_name)) assert(filecmp.cmp(self.mbox_name, self.copy_name, shallow=0)) @@ -532,7 +535,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -557,7 +560,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -585,7 +588,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -680,7 +683,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -703,7 +706,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -726,7 +729,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -760,11 +763,11 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system_long": - run = "./archivemail.py --preserve-unread --quiet %s" % \ + run = "python 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 + run = "python archivemail.py -u --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -788,11 +791,11 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system_long": - run = "./archivemail.py --preserve-unread --quiet %s" % \ + run = "python 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 + run = "python archivemail.py -u --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -825,11 +828,11 @@ 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" % \ + run = "python 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" % \ + run = "python archivemail.py --quiet -s'%s' %s" % \ (suffix, self.mbox_name) self.assertEqual(os.system(run), 0) elif execute == "package": @@ -876,10 +879,10 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system_long": - run = "./archivemail.py --dry-run --quiet %s" % self.mbox_name + run = "python 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 + run = "python archivemail.py -n --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -912,10 +915,10 @@ archivemail.options.days_old_max = 11 archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py -d11 --quiet %s" % self.mbox_name + run = "python 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 + run = "python archivemail.py --days=11 --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -940,10 +943,10 @@ archivemail.options.days_old_max = 11 archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py -d11 --quiet %s" % self.mbox_name + run = "python 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 + run = "python archivemail.py --days=11 --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -981,7 +984,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --delete --quiet %s" % self.mbox_name + run = "python archivemail.py --delete --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1003,7 +1006,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --delete --quiet %s" % self.mbox_name + run = "python archivemail.py --delete --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1023,7 +1026,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --delete --quiet %s" % self.mbox_name + run = "python archivemail.py --delete --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1061,7 +1064,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --copy --quiet %s" % self.mbox_name + run = "python archivemail.py --copy --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1087,7 +1090,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --copy --quiet %s" % self.mbox_name + run = "python archivemail.py --copy --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1113,7 +1116,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --copy --quiet %s" % self.mbox_name + run = "python archivemail.py --copy --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1153,7 +1156,7 @@ archivemail.options.include_flagged = 0 archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1175,7 +1178,7 @@ archivemail.options.include_flagged = 1 archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --include-flagged --quiet %s" % \ + run = "python archivemail.py --include-flagged --quiet %s" % \ self.mbox_name self.assertEqual(os.system(run), 0) else: @@ -1198,7 +1201,7 @@ archivemail.options.include_flagged = 1 archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --include-flagged --quiet %s" % \ + run = "python archivemail.py --include-flagged --quiet %s" % \ self.mbox_name self.assertEqual(os.system(run), 0) else: @@ -1237,11 +1240,11 @@ archivemail.options.output_dir = self.dir_name archivemail.archive(self.mbox_name) elif execute == "system_long": - run = "./archivemail.py --output-dir=%s --quiet %s" % \ + run = "python 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" % \ + run = "python archivemail.py -o%s --quiet %s" % \ (self.dir_name, self.mbox_name) self.assertEqual(os.system(run), 0) else: @@ -1286,7 +1289,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --no-compress --quiet %s" % \ + run = "python archivemail.py --no-compress --quiet %s" % \ self.mbox_name self.assertEqual(os.system(run), 0) else: @@ -1312,7 +1315,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --no-compress --quiet %s" % \ + run = "python archivemail.py --no-compress --quiet %s" % \ self.mbox_name self.assertEqual(os.system(run), 0) else: @@ -1338,7 +1341,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --no-compress --quiet %s" % \ + run = "python archivemail.py --no-compress --quiet %s" % \ self.mbox_name self.assertEqual(os.system(run), 0) else: @@ -1365,7 +1368,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --no-compress --quiet %s" % \ + run = "python archivemail.py --no-compress --quiet %s" % \ self.mbox_name self.assertEqual(os.system(run), 0) else: @@ -1404,11 +1407,11 @@ archivemail.options.min_size = size_arg archivemail.archive(self.mbox_name) elif execute == "system_long": - run = "./archivemail.py --size=%d --quiet %s" % \ + run = "python 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" % \ + run = "python archivemail.py -S%d --quiet %s" % \ (size_arg, self.mbox_name) self.assertEqual(os.system(run), 0) else: @@ -1435,11 +1438,11 @@ archivemail.options.min_size = size_arg archivemail.archive(self.mbox_name) elif execute == "system_long": - run = "./archivemail.py --size=%d --quiet %s" % \ + run = "python 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" % \ + run = "python archivemail.py -S%d --quiet %s" % \ (size_arg, self.mbox_name) self.assertEqual(os.system(run), 0) else: @@ -1472,7 +1475,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1495,7 +1498,7 @@ if execute == "package": archivemail.archive(self.mbox_name) elif execute == "system": - run = "./archivemail.py --quiet %s" % self.mbox_name + run = "python archivemail.py --quiet %s" % self.mbox_name self.assertEqual(os.system(run), 0) else: sys.exit(1) @@ -1567,4 +1570,5 @@ if __name__ == "__main__": + os.chdir(ARCHIVEMAIL_DATADIR) unittest.main()