Modified Class Structure, moved test_dir to temp folder

python-api/tests/integrationtests/compare.py

@@ -4,85 +4,27 @@
 from scipy.linalg import norm
 from scipy import  average
 
+import tempfile
+
 import subprocess
 
+__all__ = [
+            'GenerateReferenceFrames',
+            'CompareVideo',
+            ]
+
+class BaseCompareVideo(object):
+    """docstring for BaseCompareVideo"""
 
-class CompareVideo(object):
-    """Compare a video with pre-stored frames
-    :parameter test: The test which is conducted.
-    self.TESTS stores these tests and maps them with frames
-    :parameter video: The video which has to be compared
-    """
     TESTS = {
         'composite_mode_0': 1,
         'composite_mode_1': 2,
         'composite_mode_2': 3,
         'composite_mode_3': 4,
     }
     REF_FRAME_DIR = 'reference_frames'
-    TEST_FRAME_DIR = 'test_frames'
-    def __init__(self, test, video):
-        super(CompareVideo, self).__init__()
-        self.test = test
-        self.video = video
-
-    def generate_frames(self):
-        """Generate the original frames for storage in REF_FRAME_DIR
-        """
-        if not os.path.exists(self.REF_FRAME_DIR):
-            os.mkdir(self.REF_FRAME_DIR)
-
-        cmd1 = "ffmpeg -i {0} -ss 00:00:02.000 -f image2 -vframes 1 {1}/out{2}_1.png".format(self.video, self.REF_FRAME_DIR, self.TESTS[self.test])
-        cmd2 = "ffmpeg -i {0} -ss 00:00:05.000 -f image2 -vframes 1 {1}/out{2}_2.png".format(self.video, self.REF_FRAME_DIR, self.TESTS[self.test])
-        # print cmd
-        with open(os.devnull, 'w') as tempf:
-                proc = subprocess.Popen(
-                cmd1.split(),
-                stdout=tempf,
-                stderr=tempf,
-                bufsize=-1,
-                shell=False)
-                proc.wait()
-        with open(os.devnull, 'w') as tempf:
-                proc = subprocess.Popen(
-                cmd2.split(),
-                stdout=tempf,
-                stderr=tempf,
-                bufsize=-1,
-                shell=False)
-                proc.wait()
-
-    def  compare(self):
-        x = '/out{0}_1.png'.format(self.TESTS[self.test])
-        y = '/out{0}_2.png'.format(self.TESTS[self.test])
-
-        if not os.path.exists(self.TEST_FRAME_DIR):
-            os.mkdir(self.TEST_FRAME_DIR)
-
-        cmd1 = "ffmpeg -i {0} -ss 00:00:02.000 -f image2 -vframes 1 {1}/out{2}_1.png".format(self.video, self.TEST_FRAME_DIR, self.TESTS[self.test])
-        cmd2 = "ffmpeg -i {0} -ss 00:00:05.00 -f image2 -vframes 1 {1}/out{2}_2.png".format(self.video, self.TEST_FRAME_DIR, self.TESTS[self.test])
-        # print cmd
-        with open(os.devnull, 'w') as tempf:
-                proc = subprocess.Popen(
-                cmd1.split(),
-                stdout=tempf,
-                stderr=tempf,
-                bufsize=-1,
-                shell=False)
-                proc.wait()
-        with open(os.devnull, 'w') as tempf:
-                proc = subprocess.Popen(
-                cmd2.split(),
-                stdout=tempf,
-                stderr=tempf,
-                bufsize=-1,
-                shell=False)
-                proc.wait()
-
-        res1 = self.comp_image(self.REF_FRAME_DIR+x, self.TEST_FRAME_DIR+x)
-        res2 = self.comp_image(self.REF_FRAME_DIR+y, self.TEST_FRAME_DIR+y)
-        return (res1, res2)
-
+    def __init__(self):
+        pass
 
     def to_grayscale(arr):
         "If arr is a color image (3D array), convert it to grayscale (2D array)."
@@ -119,4 +61,62 @@ def compare_images(self, img1, img2):
         z_norm = norm(diff.ravel(), 0)  # Zero norm
         return z_norm
 
+    def generate_frames(self, directory=REF_FRAME_DIR):
+        if not os.path.exists(directory):
+            os.mkdir(directory)
+
+        cmd1 = "ffmpeg -i {0} -ss 00:00:02.000 -f image2 -vframes 1 {1}/out{2}_1.png".format(self.video, directory, self.TESTS[self.test])
+        cmd2 = "ffmpeg -i {0} -ss 00:00:05.000 -f image2 -vframes 1 {1}/out{2}_2.png".format(self.video, directory, self.TESTS[self.test])
+        # print cmd
+        proc = subprocess.Popen(
+        cmd1.split(),
+        bufsize=-1,
+        shell=False)
+        proc.wait()
+
+        proc = subprocess.Popen(
+        cmd2.split(),
+        bufsize=-1,
+        shell=False)
+        proc.wait()
+
+
+
+class GenerateReferenceFrames(BaseCompareVideo):
+    """Generate the original frames for storage in reference_frames/
+    """
+
+    def __init__(self, test, video):
+        super(GenerateReferenceFrames, self).__init__()
+        self.test = test
+        self.video = video
+
+
+
+
+class CompareVideo(BaseCompareVideo):
+    """Compare a video with pre-stored frames
+    :parameter test: The test which is conducted.
+    self.TESTS stores these tests and maps them with frames
+    :parameter video: The video which has to be compared
+    """
+
+    def __init__(self, test, video):
+        super(CompareVideo, self).__init__()
+        self.test = test
+        self.video = video
+        self.TEST_FRAME_DIR = tempfile.mkdtemp()
+
+    def  compare(self):
+        x = '/out{0}_1.png'.format(self.TESTS[self.test])
+        y = '/out{0}_2.png'.format(self.TESTS[self.test])
+
+        self.generate_frames(self.TEST_FRAME_DIR)
+
+        res1 = self.comp_image(self.REF_FRAME_DIR+x, self.TEST_FRAME_DIR+x)
+        res2 = self.comp_image(self.REF_FRAME_DIR+y, self.TEST_FRAME_DIR+y)
+        return (res1, res2)
+
+
+
 

python-api/tests/integrationtests/generate_reference_frames.py

@@ -1,14 +1,17 @@
-from compare import CompareVideo
+from compare import GenerateReferenceFrames
+from test_controller import TestSetCompositeMode
 
 def set_composite_mode_ref_frames(mode):
     test = 'composite_mode_{0}'.format(mode)
     video = 'output-{0}.data'.format(mode)
-    cmpr = CompareVideo(test, video)
-    cmpr.generate_frames()
+    gen = GenerateReferenceFrames(test, video)
+    gen.generate_frames()
 
 
 def main():
+    test = TestSetCompositeMode()
     for i in range(4):
+        test.driver_set_composite_mode(i, True)
         set_composite_mode_ref_frames(i)
 
 if __name__ == '__main__':

python-api/tests/integrationtests/test_controller.py

@@ -246,10 +246,12 @@ def __init__(self, path, port, filename):
                 stderr=tempf,
                 bufsize=-1,
                 shell=False)
+
         def terminate(self):
             self.proc.terminate()
 
-    def driver_set_composite_mode(self, mode):
+    def driver_set_composite_mode(self, mode, generate_frames=False):
+
         for i in range(self.NUM):
 
             s = Server(path=PATH)
@@ -277,8 +279,8 @@ def driver_set_composite_mode(self, mode):
                 preview.terminate()
                 sources.terminate_video()
                 s.terminate()
-
-                assert self.verify_output(mode, out_file) == True
+                if not generate_frames:
+                    assert self.verify_output(mode, out_file) == True
                 # assert expected_result == res
 
             finally:
@@ -290,7 +292,7 @@ def verify_output(self, mode, video):
         test = 'composite_mode_{0}'.format(mode)
         cmpr = CompareVideo(test, video)
         res1, res2 = cmpr.compare()
-        print "\nRESULTS", res1, res2
+        print "RESULTS", res1, res2
         # TODO Experimental Value
         if res1 == 0 and res2 == 0:
             return True