Skip to content

Commit 4bb24b0

Browse files
committed
Fix method name
1 parent 727d7ac commit 4bb24b0

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

lib/oc-tests/test_remoteShareFile.py renamed to lib/owncloud/test_remoteShareFile.py

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,6 @@
8181
]
8282

8383

84-
@add_worker
85-
def setup(step):
86-
87-
step(1, 'create test users')
88-
reset_owncloud_account(num_test_users=config.oc_number_test_users)
89-
check_users(config.oc_number_test_users)
90-
91-
reset_rundir()
92-
reset_server_log_file()
93-
94-
step(15, 'Validate server log file is clean')
95-
d = make_workdir()
96-
scrape_log_file(d)
97-
98-
9984
@add_worker
10085
def sharer(step):
10186

@@ -167,7 +152,7 @@ def sharee_one(step):
167152

168153
# Accept the remote shares for user2
169154
user2 = "%s%i" % (config.oc_account_name, 2)
170-
openShares = list_remote_share(user2)
155+
openShares = list_open_remote_share(user2)
171156
for share in openShares:
172157
accept_remote_share(user2, int(share['id']))
173158
sleep(5)
@@ -244,7 +229,7 @@ def sharee_two(step):
244229

245230
# Accept the remote shares for user3
246231
user3 = "%s%i" % (config.oc_account_name, 3)
247-
openShares = list_remote_share(user3)
232+
openShares = list_open_remote_share(user3)
248233
for share in openShares:
249234
accept_remote_share(user3, int(share['id']))
250235

python/smashbox/utilities/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ def share_file_with_user(filename, sharer, sharee, **kwargs):
691691
return -2
692692

693693

694-
def list_remote_share(sharee):
694+
def list_open_remote_share(sharee):
695695
""" Accepts a remote share
696696
697697
:param sharee: user who created the original share
@@ -700,7 +700,7 @@ def list_remote_share(sharee):
700700

701701
oc_api = get_oc_api()
702702
oc_api.login(sharee, config.oc_account_password)
703-
open_remote_shares = oc_api.list_remote_share()
703+
open_remote_shares = oc_api.list_open_remote_share()
704704

705705
return open_remote_shares
706706

0 commit comments

Comments
 (0)