Skip to content

Commit 552dd32

Browse files
committed
delete unneeded _get_value() function and unneeded test parms
1 parent ad05e37 commit 552dd32

File tree

2 files changed

+0
-69
lines changed

2 files changed

+0
-69
lines changed

src/diffpy/utils/tools.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ def get_user_info(owner_name=None, owner_email=None, owner_orcid=None):
122122
return user_info
123123

124124

125-
def _get_value(mystring):
126-
return mystring.strip()
127-
128-
129125
def check_and_build_global_config(skip_config_creation=False):
130126
config_path = Path().home() / "diffpyconfig.json"
131127
if skip_config_creation:

tests/test_tools.py

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -7,71 +7,6 @@
77

88
from diffpy.utils.tools import check_and_build_global_config, get_package_info, get_user_info
99

10-
# def _setup_dirs(monkeypatch, user_filesystem):
11-
# home_dir, cwd_dir = user_filesystem.home_dir, user_filesystem.cwd_dir
12-
# os.chdir(cwd_dir)
13-
# return home_dir
14-
#
15-
16-
17-
def _run_tests(inputs, expected):
18-
args = {"username": inputs[0], "email": inputs[1]}
19-
expected_username, expected_email = expected
20-
config = get_user_info(args)
21-
assert config.get("username") == expected_username
22-
assert config.get("email") == expected_email
23-
24-
25-
params_user_info_with_local_conf_file = [
26-
(["", ""], ["cwd_username", "cwd@email.com"]),
27-
(["cli_username", ""], ["cli_username", "cwd@email.com"]),
28-
(["", "cli@email.com"], ["cwd_username", "cli@email.com"]),
29-
([None, None], ["cwd_username", "cwd@email.com"]),
30-
(["cli_username", None], ["cli_username", "cwd@email.com"]),
31-
([None, "cli@email.com"], ["cwd_username", "cli@email.com"]),
32-
(["cli_username", "cli@email.com"], ["cli_username", "cli@email.com"]),
33-
]
34-
params_user_info_with_no_home_conf_file = [
35-
(
36-
[None, None],
37-
["input_username", "input@email.com"],
38-
["input_username", "input@email.com"],
39-
),
40-
(
41-
["cli_username", None],
42-
["", "input@email.com"],
43-
["cli_username", "input@email.com"],
44-
),
45-
(
46-
[None, "cli@email.com"],
47-
["input_username", ""],
48-
["input_username", "cli@email.com"],
49-
),
50-
(
51-
["", ""],
52-
["input_username", "input@email.com"],
53-
["input_username", "input@email.com"],
54-
),
55-
(
56-
["cli_username", ""],
57-
["", "input@email.com"],
58-
["cli_username", "input@email.com"],
59-
),
60-
(
61-
["", "cli@email.com"],
62-
["input_username", ""],
63-
["input_username", "cli@email.com"],
64-
),
65-
(
66-
["cli_username", "cli@email.com"],
67-
["input_username", "input@email.com"],
68-
["cli_username", "cli@email.com"],
69-
),
70-
]
71-
params_user_info_no_conf_file_no_inputs = [
72-
([None, None], ["", ""], ["", ""]),
73-
]
74-
7510

7611
@pytest.mark.parametrize(
7712
"runtime_inputs, expected",

0 commit comments

Comments
 (0)