Fixed MS tests path (refs #20214).

.gitignore

@@ -27,4 +27,6 @@ pip-log.txt
 .tox
 nosetests.xml
 
-local_conf.py
+# Envsetup
+conf-*
+tests/ms-testing-suite

tester.py

@@ -113,17 +113,20 @@ class Tester():
             return tests
         for name in names:
             test_path = os.path.join(path, name)
-            description = self.get_file_description(test_path)
-            tests.append((name, description, [test_path]))
+            if os.path.isfile(test_path):
+                description = self.get_file_description(test_path)
+                tests.append((name, description, [test_path]))
         # Get MediaServer tests
         if ms:
             # Clone testing suite
             ms_path = os.path.join(path, 'ms-testing-suite')
             if os.path.exists(ms_path):
+                log('Updating ms-testing-suite in "%s".' % ms_path)
                 os.chdir(ms_path)
                 subprocess.check_call(['git', 'pull'])
                 os.chdir(self.root_dir)
             else:
+                log('Cloning ms-testing-suite in "%s".' % ms_path)
                 subprocess.check_call(['git', 'clone', 'https://git.ubicast.net/mediaserver/ms-testing-suite.git', ms_path])
             ms_tests = ['ms_vod_tester.py']
             # Get MS instances
@@ -134,13 +137,13 @@ class Tester():
             # check that Wowza is installed
             wowza_dir = '/usr/local/WowzaStreamingEngine'
             if not os.path.exists(wowza_dir):
-                log('Info: Wowza is not installed ("%s" does not exist).' % wowza_dir)
+                log('Wowza is not installed ("%s" does not exist), the live test will not be run.' % wowza_dir)
             else:
                 ms_tests.append('ms_live_tester.py')
             # Add tests to list
             for user in users:
                 for name in ms_tests:
-                    test_path = os.path.join(path, name)
+                    test_path = os.path.join(ms_path, name)
                     description = self.get_file_description(test_path)
                     tests.append(('%s (%s)' % (name, user), description, [test_path, user]))
         return tests