Fix some tests

Author: Dimitar Topuzov

run_tests.py

@@ -34,8 +34,8 @@ def AnalyzeResultAndExit():
 
     # Cleanup folders created by test execution
     remove('stderr.txt')
-	CleanupFolder('app')
-	CleanupFolder('TNS App')
+    CleanupFolder('app')
+    CleanupFolder('TNS App')
     CleanupFolder('TNS App')
     CleanupFolder('TNS_TempApp')
     CleanupFolder('folder')

tests/platform_linux.py

@@ -84,8 +84,11 @@ def test_005_Platform_Add_Android_Symlink_And_FrameworkPath(self):
         CreateProject(projName="TNS_App")
         output = PlatformAdd(platform="android", path="TNS_App", frameworkPath=androidRuntimeSymlinkPath, symlink=True)
         assert("Copying template files..." in output)
-        assert("Updated project.properties" in output)
-        assert("Updated local.properties" in output)
+        
+        # Not valid for 1.3.0+
+        # assert("Updated project.properties" in output)
+        # assert("Updated local.properties" in output)
+        
         assert("Project successfully created" in output)
         assert IsEmpty('TNS_App/platforms/android/assets')
         assert IsEmpty('TNS_App/platforms/android/libs')
@@ -114,8 +117,11 @@ def test_201_Platform_Add_Android_InsideProject(self):
         os.chdir(currentDir);
 
         assert("Copying template files..." in output)
-        assert("Updated project.properties" in output)
-        assert("Updated local.properties" in output)
+        
+        # Not valid for 1.3.0+
+        # assert("Updated project.properties" in output)
+        # assert("Updated local.properties" in output)
+        
         assert("Project successfully created" in output)
 
         if ('TESTRUN' in os.environ) and (not "SMOKE" in os.environ['TESTRUN']) and ("2" in os.environ['ANDROID_HOME']):
@@ -233,8 +239,11 @@ def test_220_SetSDK(self):
         CreateProject(projName="TNS_App")
         output = PlatformAdd(platform="android --sdk 19", frameworkPath=androidRuntimePath, path="TNS_App")
         assert("Copying template files..." in output)
-        assert("Updated project.properties" in output)
-        assert("Updated local.properties" in output)
+        
+        # Not valid for 1.3.0+
+        # assert("Updated project.properties" in output)
+        # assert("Updated local.properties" in output)
+        
         assert("Project successfully created" in output)
         output = runAUT("cat cat TNS_App/platforms/android/AndroidManifest.xml ")
         assert ("android:minSdkVersion=\"17\"" in output)      

tests/prepare_linux.py

@@ -47,8 +47,9 @@ def test_201_Prepare_PlatformThatIsNotAdded(self):
         CreateProject(projName="TNS_App")  
         output = runAUT(tnsPath + " prepare android --path TNS_App");
         assert("Copying template files..." in output)
-        assert("Updated project.properties" in output)
-        assert("Updated local.properties" in output)
+        # Not valid for 1.3.0+
+        # assert("Updated project.properties" in output)
+        # assert("Updated local.properties" in output)
         assert("Project successfully created." in output)
         assert("Project successfully prepared" in output)
 

tns_tests_runner.py

@@ -24,6 +24,7 @@
 from tests.livesync_ios import LiveSync_iOS
 from tests.livesync_linux import LiveSync_Linux
 from tests.logtrace import LogTrace
+from tests.output_stderr import Output_STRERR
 from tests.platform_linux import Platform_Linux
 from tests.platform_osx import Platform_OSX
 from tests.plugins_linux import Plugins_Linux
@@ -85,7 +86,7 @@ def RunTests():
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Autocomplete))
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(UsageAndErrorTracking))
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Output_STRERR))
-	suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Doctor))
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Doctor))
 
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Create))    
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Platform_Linux))