File tree Expand file tree Collapse file tree 5 files changed +9
-1
lines changed Expand file tree Collapse file tree 5 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ shares:
19
19
backend :
20
20
# If present override default backend filesystem
21
21
name : cephfs.vfs
22
+ # if present, provide access to backend filesystem
23
+ path : /mnt/backend/export1
22
24
# If present, use these credentials to perform the
23
25
# tests for this share
24
26
users :
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ def test_read_yaml1():
9
9
assert export1 ["server" ] == "hostname1"
10
10
assert export1 ["path" ] == "/mnt/share/export1-cephfs-vfs"
11
11
assert export1 ["backend" ]["name" ] == "cephfs.vfs"
12
+ assert export1 ["backend" ]["path" ] == "/mnt/backend/export1"
12
13
assert "user1" not in export1 ["users" ]
13
14
assert "test2" in export1 ["users" ]
14
15
assert export1 ["users" ]["test2" ] == "x"
@@ -17,6 +18,7 @@ def test_read_yaml1():
17
18
assert export2 ["server" ] == "server_name"
18
19
assert "path" not in export2
19
20
assert export2 ["backend" ]["name" ] == "glusterfs"
21
+ assert export2 ["backend" ]["path" ] is None
20
22
assert "test2" not in export2 ["users" ]
21
23
assert "user2" in export2 ["users" ]
22
24
assert export2 ["users" ]["user2" ] == "user2password"
Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ shares:
19
19
backend:
20
20
# If present override default backend filesystem
21
21
name: cephfs.vfs
22
+ # If present, provide access to backend filesystem
23
+ path: /mnt/backend/export1
22
24
# If present, use these credentials to perform the
23
25
# tests for this share
24
26
users:
Original file line number Diff line number Diff line change @@ -54,10 +54,11 @@ def read_yaml(test_info_file):
54
54
shares [sharename ] = {"name" : sharename }
55
55
share = shares [sharename ]
56
56
share .setdefault ("name" , sharename )
57
- share .setdefault ("backend" , {})
58
57
share .setdefault ("server" , default_server )
59
58
share .setdefault ("users" , default_users )
59
+ share .setdefault ("backend" , {})
60
60
share ["backend" ].setdefault ("name" , default_backend )
61
+ share ["backend" ].setdefault ("path" , None )
61
62
62
63
test_info ["shares" ] = shares
63
64
Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ commands = pytest -vrfEsxXpP testcases/consistency
39
39
deps =
40
40
pytest
41
41
pyyaml
42
+ pysmb
42
43
changedir = {toxinidir}/selftest
43
44
commands = pytest -vrfEsxXpP .
44
45
You can’t perform that action at this time.
0 commit comments