Changeset be6c0a2 in flex_extract.git for Testing/Regression/Mars_request/test_cmp_mars_requests.py

Timestamp:

Dec 19, 2019, 7:37:03 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

0d99607

Parents:

4421b17

Message:

added Readme to tests; changed directory structure; added recent test results;

File:

• Testing/Regression/Mars_request/test_cmp_mars_requests.py (modified) (7 diffs, 1 prop)

Testing/Regression/Mars_request/test_cmp_mars_requests.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """Comparison of the created MARS requests of two flex_extract versions.
@@ -39 +39 @@
 from datetime import datetime
 
-sys.path.append('../../../source/python')
+sys.path.append('../../../Source/Python')
 import _config
-from  mods.tools import init128
+from  Mods.tools import init128
 
 # ------------------------------------------------------------------------------
@@ -137 +137 @@
         else:
             err_msg += 'Unconsistency happend to be in column: ' + col + '\n'
-            print mr_new[col]
-            print mr_old[col]
+            print("THERE SEEMS TO BE AN ERROR:")
+            print("CONTENT OF NEW VERSION:")
+            print(mr_new[col])
+            print("CONTENT OF OLD VERSION:")
+            print(mr_old[col])
             return False
     return lresult
@@ -186 +189 @@
             
             nsteps = str(int(steps[1]))+'/to/'+str(int(steps[-1]))+'/by/'+str(int(dtime))
-            return nsteps
-            
+            return nsteps            
     
     return mr_old
@@ -252 +254 @@
     time_str = currenttime.strftime('%Y-%m-%d_%H-%M-%S')
     logfile = os.path.join(log_path, 'log_' + time_str)
-    with open(logfile, 'aw') as f:
+    with open(logfile, 'a') as f:
         f.write('Compare mars requests between version ' + old_dir +
                 ' and version ' + new_dir + ' : \n')
@@ -288 +290 @@
         mr_old['param'] = mr_old['param'].apply(to_param_id, args=[table128])
         mr_old['number'] = mr_old['number'].apply(convert_param_numbers)  
-        if '142' in mr_old.ix[0,'param']: # if flux request
-            mr_old.ix[0,'step'] = convert_param_step(mr_old.ix[0,'step'])
-
-        print 'Results: ', c
+        if '142' in mr_old.loc[0,'param']: # if flux request
+            mr_old.loc[0,'step'] = convert_param_step(mr_old.loc[0,'step'])
+
+        print('Results: ', c)
 
         # do tests on mr files
@@ -302 +304 @@
 
         # write out result to logging file
-        with open(logfile, 'aw') as f:
+        with open(logfile, 'a') as f:
             if lcoleq and lnoeq and lcoeq:
                 f.write('... ' + c + ' ... OK!' + '\n')