diff options
| -rwxr-xr-x | test/gvfs-test | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/gvfs-test b/test/gvfs-test index 93822c0b..8b9e0284 100755 --- a/test/gvfs-test +++ b/test/gvfs-test @@ -839,7 +839,10 @@ ncalrpc dir = %(workdir)s/samba def test_anonymous(self): '''smb:// anonymous''' - uri = 'smb://%s:%d/public' % (os.uname()[1], SMB_USER_PORT) + if in_testbed: + uri = 'smb://%s/public' % (os.uname()[1]) + else: + uri = 'smb://%s:%d/public' % (os.uname()[1], SMB_USER_PORT) # ensure that this does not ask for any credentials mount = subprocess.Popen(['gio', 'mount', '-a', uri]) @@ -860,7 +863,11 @@ ncalrpc dir = %(workdir)s/samba def test_authenticated(self): '''smb:// authenticated''' - uri = 'smb://%s@%s:%d/private' % (os.environ['USER'], os.uname()[1], SMB_USER_PORT) + if in_testbed: + uri = 'smb://%s@%s/private' % (os.environ['USER'], os.uname()[1]) + else: + uri = 'smb://%s@%s:%d/private' % (os.environ['USER'], os.uname()[1], SMB_USER_PORT) + mount = subprocess.Popen(['gio', 'mount', uri], stdin=subprocess.PIPE, stdout=subprocess.PIPE, |