unittest and corrections

Author: alainabbas

src/bin/lifecycle.py

@@ -33,7 +33,7 @@ def main():
     lifecycle_dir = '../lifecycle'
     raw = sys.stdin.read()
     content = raw.replace("\n", "")
-
+    config = u.read_config('../etc/config.conf')
     try:
         data = json.loads(content)
         before = data['payload']['before']['lifecycle']

src/lib/backend_utils.py

@@ -45,7 +45,6 @@ def returncode(code,message):
     return json.dumps(data)
 
 def is_backend_concerned(entity):
-    br=config('branchAttr')
     entry=make_entry_array(entity)
     if config('branchAttr') in entry:
         peopleType=entry[config('branchAttr')]
@@ -60,6 +59,7 @@ def is_backend_concerned(entity):
         for v in peopleType:
           if v in listBackend :
              return True
+    return False
 
 def make_entry_array(entity,key='before'):
     data = {}

unittest/files_ad_utils/lifecycle-notconcerned.json

@@ -22,7 +22,7 @@
         ],
         "employeeType": "TAIGA",
         "departmentNumber": [
-          "esn"
+          "xxx"
         ],
         "jpegPhoto": "",
         "userCertificate": ""
@@ -60,7 +60,7 @@
               "2"
             ],
             "supannTypeEntiteAffectation": [
-              "esn"
+              "xxx"
             ],
             "supanncivilite": "M.",
             "supannCodeINSEEPaysDeNaissance": "",

unittest/lifecycleTest.py

@@ -131,20 +131,41 @@ def test_stdout_captured_as_string(self):
 
 class TestLifecycleBin(unittest.TestCase):
     """Integration tests: invoke lifecycle.py as a subprocess."""
-
-    def run_backend(self, script, file):
+    def run_backend(self,script, file= "",args=""):
+        dir = os.getcwd()
+        exe=dir + __PYTHONENV__
+        execargs=[]
+        execargs.append(exe)
+        execargs.append(script)
+        if args :
+            execargs.append(args)
+        if file == '':
+            os.chdir('../src/bin')
+            ret = subprocess.run(execargs,capture_output=True)
+        else:
+            #open file to pass to stdin
+            fic = open(file, "r")
+            content = fic.read()
+            content = content.replace("\n", "")
+            fic.close()
+            os.chdir('../src/bin')
+            ret = subprocess.run(execargs,input=content.encode(),capture_output=True)
+        os.chdir(dir)
+        return { "returncode" : ret.returncode,"stdout" : ret.stdout.decode()}
+
+    def run_backend1(self, script, file):
         dir_ = os.getcwd()
         exe = dir_ + __PYTHONENV__
         with open(file, 'r') as fic:
             content = fic.read().replace('\n', '')
         os.chdir('../src/bin')
-        ret = subprocess.run([exe, script], input=content.encode(), capture_output=True)
+        ret = subprocess.run([script], input=content.encode(), capture_output=True)
         os.chdir(dir_)
         return {'returncode': ret.returncode, 'stdout': ret.stdout.decode()}
 
     def test_lifecycle_concerned(self):
         """lifecycle.json: O→I transition, concerned backend → lifecycle script runs."""
-        ret = self.run_backend('lifecycle.py', './files_ad_utils/lifecycle.json')
+        ret = self.run_backend('./lifecycle.py', './files_ad_utils/lifecycle.json')
         self.assertEqual(ret['returncode'], 0)
         result = json.loads(ret['stdout'])
         self.assertEqual(result['status'], 0)