[gvfs/wip/test-no-port-when-in-sandbox] gvfs-test: Don't specify the port if we are running in the sandbox
- From: Iain Lane <iainl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs/wip/test-no-port-when-in-sandbox] gvfs-test: Don't specify the port if we are running in the sandbox
- Date: Tue, 25 Sep 2018 11:45:59 +0000 (UTC)
commit dd7abaffa1d1154afd8b27ea83428837d25c9f14
Author: Iain Lane <iainl gnome org>
Date: Mon Sep 24 16:09:47 2018 +0100
gvfs-test: Don't specify the port if we are running in the sandbox
In this case the smb config is set up using the default port by the
sandbox itself - the config in the testsuite is not used.
test/gvfs-test | 11 +++++++++--
1 file 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]