Merge pull request #1610 from mhmdfy/remove-jean-img

Remove jean img

build.xml

@@ -243,30 +243,4 @@
         <unzip src="${nbdist.dir}/${app.name}-${app.version}.zip" dest="${nbdist.dir}/${app.name}-installer"/>
         <antcall target="build-installer-${os.family}" />
     </target>
-    
-    <property name="test-input" location="Test/input"/>
-    <target name="test-download-imgs" description="Get test images and store them in the path represented by the test-input variable.">
-         <available file="${test-input}/nps-2008-jean.E01" property="img-present-1"/>
-         <available file="${test-input}/nps-2008-jean.E02" property="img-present-2"/>
-         <if>
-             <equals arg1="${img-present-1}" arg2="true"/>
-             <then>
-                <echo message = "nps-2008-jean.E01 already present."/>
-             </then>
-             <else>
-                <mkdir dir="${test-input}" />
-                <get src="http://digitalcorpora.org/corp/nps/drives/nps-2008-jean/nps-2008-jean.E01" dest="${test-input}"/>                
-             </else>
-         </if>
-         <if>
-             <equals arg1="${img-present-2}" arg2="true"/>
-             <then>
-                <echo message = "nps-2008-jean.E02 already present."/>
-             </then>
-             <else>
-                <mkdir dir="${test-input}" />
-                <get src="http://digitalcorpora.org/corp/nps/drives/nps-2008-jean/nps-2008-jean.E02" dest="${test-input}"/>                
-             </else>
-         </if>
-    </target>
 </project>

test/script/config.xml

@@ -27,13 +27,6 @@ It is up to the user to distinguish between the paths when adding to this file.
 
 <Properties>
     <!-- Path to input directory -->
-    <!--indir value="X:\path\to\input\directory" /-->
-    <!-- Path to global CSV file -->
-    <!--global_csv value="X:\path\to\global\csv.txt" /-->
-    <!-- Path to images -->
-    <image value="..\input\nps-2008-jean.E01" />
-    <!--image value="../input/file.E01" /-->
-    <!--image value="This provokes an error." /-->
-    <!--image value="X:\Invalid\Path\Does\Not\Exist.img" /-->
-	<!--build value="X:\Path\To\Build\File.xml"-->
+    <!-- example: -->
+    <!--<image value="path-to-img" />-->
 </Properties>

test/script/regression.py

@@ -93,8 +93,6 @@ def usage():
 	print ("-v verbose mode")
 	print ("-e ARG Enable exception mode with given string")
 	print ("-h help")
-	print ("-fr Do not download new images each time")
-
 
 #----------------------#
 #        Main          #
@@ -108,19 +106,6 @@ def main():
         return
     test_config = TestConfiguration(args)
 
-    # Download images unless they asked not to
-    if(not args.fr):
-        antin = ["ant"]
-        antin.append("-f")
-        antin.append(os.path.join("..","..","build.xml"))
-        antin.append("test-download-imgs")
-        if SYS is OS.CYGWIN:
-            subprocess.call(antin)
-        elif SYS is OS.WIN:
-            theproc = subprocess.Popen(antin, shell = True, stdout=subprocess.PIPE)
-            theproc.communicate()
-
-    # Otherwise test away!
     TestRunner.run_tests(test_config)
 
 
@@ -1666,7 +1651,6 @@ def __init__(self):
         self.verbose = False
         self.exception = False
         self.exception_string = ""
-        self.fr = False
         self.copy_diff_files = False
         self.diff_files_output_folder = ""
 
@@ -1721,9 +1705,6 @@ def parse(self):
             elif arg == "-h" or arg == "--help":
                 usage()
                 return False
-            elif arg == "-fr" or arg == "--forcerun":
-                print("Not downloading new images")
-                self.fr = True
             elif arg == "-o" or arg == "--output":
                 try:
                     arg = sys.argv.pop(0)