Further test fixes

Author: screamerbg

mbed/mbed.py

@@ -1133,6 +1133,9 @@ def isurl(cls, url):
 
     @classmethod
     def isinsecure(cls, url):
+        path = re.sub(r'^(.+)[#?].*$', r'\1', url)
+        if os.path.isdir(path): # local paths are secure
+            return False
         up = urlparse(url)
         return (not up) or (up.scheme and up.scheme not in ['http', 'https', 'ssh', 'git']) or (up.port and int(up.port) not in [22, 80, 443])
 

test/add_test.py

@@ -20,7 +20,7 @@ def test_add(mbed, testrepos):
         popen(['python', mbed, 'add', test3, "-vv"])
 
     assertls(mbed, 'test1', [
-        "*",
+        "[mbed]",
         "test1",
         "|- test2",
         "|  `- test3",
@@ -38,7 +38,7 @@ def test_import_after_add(mbed, testrepos):
     popen(['python', mbed, 'import', test1, 'testimport', "-vv"])
 
     assertls(mbed, 'testimport', [
-        "*",
+        "[mbed]",
         "testimport",
         "|- test2",
         "|  `- test3",

test/import_test.py

@@ -18,7 +18,7 @@ def test_import(mbed, testrepos):
     popen(['python', mbed, 'import', test1, 'testimport'])
 
     assertls(mbed, 'testimport', [
-        "*",
+        "[mbed]",
         "testimport",
         "`- test2",
         "   `- test3",

test/ls_test.py

@@ -15,7 +15,7 @@
 # Tests 'mbed ls' and provides sanity check of test framework
 def test_ls(mbed, testrepos):
     assertls(mbed, 'test1', [
-        "*",
+        "[mbed]",
         "test1",
         "`- test2",
         "   `- test3",

test/remove_test.py

@@ -18,7 +18,7 @@ def test_remove(mbed, testrepos):
         popen(['python', mbed, 'remove', 'test2'])
 
     assertls(mbed, 'test1', [
-        "*",
+        "[mbed]",
         "test1",
     ])
 
@@ -31,6 +31,6 @@ def test_import_after_remove(mbed, testrepos):
     popen(['python', mbed, 'import', test1, 'testimport'])
 
     assertls(mbed, 'testimport', [
-        "*",
+        "[mbed]",
         "testimport",
     ])

test/sync_update_test.py

@@ -51,7 +51,7 @@ def test_sync_update_remove(mbed, testrepos):
         popen(['python', mbed, 'update', '-vv'])
 
     assertls(mbed, 'testimport', [
-        "*",
+        "[mbed]",
         "testimport",
         "`- test2",
     ])
@@ -74,7 +74,7 @@ def test_sync_update_add(mbed, testrepos):
         popen(['python', mbed, 'update', '-vv'])
 
     assertls(mbed, 'testimport', [
-        "*",
+        "[mbed]",
         "testimport",
         "`- test2",
         "   |- test3",
@@ -101,7 +101,7 @@ def test_sync_update_move(mbed, testrepos):
         popen(['python', mbed, 'update', '-vv'])
 
     assertls(mbed, 'testimport', [
-        "*",
+        "[mbed]",
         "testimport",
         "`- test2",
         "   `- testmove",