Skip to content

Commit

Permalink
hopefully fixed BGC_magic remote testing problem
Browse files Browse the repository at this point in the history
  • Loading branch information
moonshoes87 committed Aug 25, 2015
1 parent 369e58a commit dd5f58d
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions unittests/test_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ def test_IODP_with_one_file(self):
options['input_dir_path'] = dir_path
options['csv_file'] = 'srmdiscrete-XXX-UTEST-A.csv'
program_ran, outfile = IODP_dscr_magic.main(False, **options)
print 'outfile!', outfile
self.assertTrue(program_ran)
self.assertEqual(outfile, os.path.join('.', 'magic_measurements.txt'))

Expand Down Expand Up @@ -385,19 +384,6 @@ def setUp(self):

def tearDown(self):
filelist = ['96MT.05.01.magic', 'BC0-3A.magic', 'magic_measurements.txt', 'er_specimens.txt', 'er_samples.txt', 'er_sites.txt']
#directory = os.path.join(WD, 'Datafiles', 'Measurement_Import', 'BGC_magic')
#print 'directory', directory
print 'parent_dir', os.path.join(WD, 'Datafiles', 'Measurement_Import')
print "os.listdir(os.path.join(WD, 'Datafiles', 'Measurement_Import')", os.path.join(WD, 'Datafiles', 'Measurement_Import')
print '-'
print 'self.input_dir:', self.input_dir
print '-'
print 'os.path.isdir(self.input_dir):', os.path.isdir(self.input_dir)
print '-'
print 'os.listdir(self.input_dir):', os.listdir(self.input_dir)
print '-'
print 'os.listdir(os.path.join(WD, "Datafiles", "Measurement_import")):', os.listdir(os.path.join(WD, "Datafiles", "Measurement_import"))
print '-'
pmag.remove_files(filelist, self.input_dir)

def test_BGC_with_no_files(self):
Expand All @@ -406,9 +392,6 @@ def test_BGC_with_no_files(self):
self.assertEqual(error_message, 'You must provide a BCG format file')

def test_BGC_success(self):
print 'in test_BGC_success'
print 'self.input_dir', self.input_dir
print 'os.listdir(self.input_dir)', os.listdir(self.input_dir)
options = {'input_dir_path': self.input_dir, 'mag_file': '96MT.05.01'}
program_ran, outfile = BGC_magic.main(False, **options)
self.assertTrue(program_ran)
Expand Down

0 comments on commit dd5f58d

Please sign in to comment.