Skip to content

Commit 650644c

Browse files
erijoerijo
committed
Rename the alt variables local_* to YADM_* and export them
local_class -> YADM_CLASS local_system -> YADM_OS local_host -> YADM_HOSTNAME local_user -> YADM_USER local_distro -> YADM_DISTRO The new names match the names used for j2/esh templates.
1 parent 2f00dab commit 650644c

File tree

7 files changed

+119
-141
lines changed

7 files changed

+119
-141
lines changed

‎test/test_unit_record_score.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
import pytest
33

44
INIT_VARS = """
5-
score=0
6-
local_class=testclass
7-
local_system=testsystem
8-
local_host=testhost
9-
local_user=testuser
105
alt_scores=()
116
alt_targets=()
127
alt_sources=()

‎test/test_unit_score_file.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'labels': ['a', 'arch', 'architecture'],
1111
'modifier': 1,
1212
},
13-
'system': {
13+
'os': {
1414
'labels': ['o', 'os'],
1515
'modifier': 2,
1616
},
@@ -54,9 +54,9 @@ def calculate_score(filename):
5454
else:
5555
score = 0
5656
break
57-
elif label in CONDITION['system']['labels']:
58-
if value == 'testsystem':
59-
score += 1000 + CONDITION['system']['modifier']
57+
elif label in CONDITION['os']['labels']:
58+
if value == 'testos':
59+
score += 1000 + CONDITION['os']['modifier']
6060
else:
6161
score = 0
6262
break
@@ -95,7 +95,7 @@ def calculate_score(filename):
9595
@pytest.mark.parametrize(
9696
'arch', ['arch', None], ids=['arch', 'no-arch'])
9797
@pytest.mark.parametrize(
98-
'system', ['system', None], ids=['system', 'no-system'])
98+
'system', ['os', None], ids=['os', 'no-os'])
9999
@pytest.mark.parametrize(
100100
'distro', ['distro', None], ids=['distro', 'no-distro'])
101101
@pytest.mark.parametrize(
@@ -110,9 +110,9 @@ def test_score_values(
110110
# pylint: disable=too-many-branches
111111
local_class = 'testclass'
112112
local_arch = 'testarch'
113-
local_system = 'testsystem'
113+
local_os = 'testos'
114114
local_distro = 'testdistro'
115-
local_host = 'testhost'
115+
local_hostname = 'testhost'
116116
local_user = 'testuser'
117117
filenames = {'filename##': 0}
118118

@@ -145,7 +145,7 @@ def test_score_values(
145145
newfile += ','
146146
newfile += '.'.join([
147147
label,
148-
local_system if match else 'badsys'
148+
local_os if match else 'bados'
149149
])
150150
filenames[newfile] = calculate_score(newfile)
151151
if distro:
@@ -181,7 +181,7 @@ def test_score_values(
181181
newfile += ','
182182
newfile += '.'.join([
183183
label,
184-
local_host if match else 'badhost'
184+
local_hostname if match else 'badhost'
185185
])
186186
filenames[newfile] = calculate_score(newfile)
187187
if user:
@@ -200,12 +200,12 @@ def test_score_values(
200200
script = f"""
201201
YADM_TEST=1 source {yadm}
202202
score=0
203-
local_class={local_class}
204-
local_arch={local_arch}
205-
local_system={local_system}
206-
local_distro={local_distro}
207-
local_host={local_host}
208-
local_user={local_user}
203+
YADM_CLASS={local_class}
204+
YADM_ARCH={local_arch}
205+
YADM_OS={local_os}
206+
YADM_DISTRO={local_distro}
207+
YADM_HOSTNAME={local_hostname}
208+
YADM_USER={local_user}
209209
"""
210210
expected = ''
211211
for filename in filenames:
@@ -233,7 +233,7 @@ def test_extensions(runner, yadm, ext):
233233
script = f"""
234234
YADM_TEST=1 source {yadm}
235235
score=0
236-
local_user={local_user}
236+
YADM_USER={local_user}
237237
score_file "{filename}"
238238
echo "$score"
239239
"""
@@ -248,9 +248,9 @@ def test_score_values_templates(runner, yadm):
248248
"""Test score results"""
249249
local_class = 'testclass'
250250
local_arch = 'arch'
251-
local_system = 'testsystem'
251+
local_os = 'testos'
252252
local_distro = 'testdistro'
253-
local_host = 'testhost'
253+
local_hostname = 'testhost'
254254
local_user = 'testuser'
255255
filenames = {'filename##': 0}
256256

@@ -265,12 +265,12 @@ def test_score_values_templates(runner, yadm):
265265
script = f"""
266266
YADM_TEST=1 source {yadm}
267267
score=0
268-
local_class={local_class}
269-
local_arch={local_arch}
270-
local_system={local_system}
271-
local_distro={local_distro}
272-
local_host={local_host}
273-
local_user={local_user}
268+
YADM_CLASS={local_class}
269+
YADM_ARCH={local_arch}
270+
YADM_OS={local_os}
271+
YADM_DISTRO={local_distro}
272+
YADM_HOSTNAME={local_hostname}
273+
YADM_USER={local_user}
274274
"""
275275
expected = ''
276276
for filename in filenames:

‎test/test_unit_set_local_alt_values.py‎ renamed to ‎test/test_unit_set_alt_values.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""Unit tests: set_local_alt_values"""
1+
"""Unit tests: set_alt_values"""
22
import pytest
33
import utils
44

@@ -20,18 +20,18 @@
2020
]
2121
)
2222
@pytest.mark.usefixtures('ds1_copy')
23-
def test_set_local_alt_values(
23+
def test_set_alt_values(
2424
runner, yadm, paths, tst_sys, tst_host, tst_user, override):
2525
"""Use issue_legacy_path_warning"""
2626
script = f"""
2727
YADM_TEST=1 source {yadm} &&
2828
set_operating_system &&
2929
YADM_DIR={paths.yadm} YADM_DATA={paths.data} configure_paths &&
30-
set_local_alt_values
31-
echo "class='$local_class'"
32-
echo "os='$local_system'"
33-
echo "host='$local_host'"
34-
echo "user='$local_user'"
30+
set_alt_values
31+
echo "class='$YADM_CLASS'"
32+
echo "os='$YADM_OS'"
33+
echo "host='$YADM_HOSTNAME'"
34+
echo "user='$YADM_USER'"
3535
"""
3636

3737
if override:
@@ -69,8 +69,8 @@ def test_distro(runner, yadm):
6969
YADM_TEST=1 source {yadm}
7070
function config() {{ echo "$1"; }}
7171
function query_distro() {{ echo "testdistro"; }}
72-
set_local_alt_values
73-
echo "distro='$local_distro'"
72+
set_alt_values
73+
echo "distro='$YADM_DISTRO'"
7474
"""
7575
run = runner(command=['bash'], inp=script)
7676
assert run.success

‎test/test_unit_template_default.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# these values are also testing the handling of bizarre characters
77
LOCAL_CLASS = "default_Test+@-!^Class"
88
LOCAL_ARCH = "default_Test+@-!^Arch"
9-
LOCAL_SYSTEM = "default_Test+@-!^System"
10-
LOCAL_HOST = "default_Test+@-!^Host"
9+
LOCAL_OS = "default_Test+@-!^System"
10+
LOCAL_HOSTNAME = "default_Test+@-!^Host"
1111
LOCAL_USER = "default_Test+@-!^User"
1212
LOCAL_DISTRO = "default_Test+@-!^Distro"
1313
TEMPLATE = f'''
@@ -47,7 +47,7 @@
4747
{{% if yadm.os == "wrongos1" %}}
4848
wrong os 1
4949
{{% endif %}}
50-
{{% if yadm.os == "{LOCAL_SYSTEM}" %}}
50+
{{% if yadm.os == "{LOCAL_OS}" %}}
5151
Included section for os = {{{{yadm.os}}}} ({{{{yadm.os}}}} repeated)
5252
{{% endif %}}
5353
{{% if yadm.os == "wrongos2" %}}
@@ -56,7 +56,7 @@
5656
{{% if yadm.hostname == "wronghost1" %}}
5757
wrong host 1
5858
{{% endif %}}
59-
{{% if yadm.hostname == "{LOCAL_HOST}" %}}
59+
{{% if yadm.hostname == "{LOCAL_HOSTNAME}" %}}
6060
Included section for host = {{{{yadm.hostname}}}} ({{{{yadm.hostname}}}} again)
6161
{{% endif %}}
6262
{{% if yadm.hostname == "wronghost2" %}}
@@ -86,16 +86,16 @@
8686
start of template
8787
default class = >{LOCAL_CLASS}<
8888
default arch = >{LOCAL_ARCH}<
89-
default os = >{LOCAL_SYSTEM}<
90-
default host = >{LOCAL_HOST}<
89+
default os = >{LOCAL_OS}<
90+
default host = >{LOCAL_HOSTNAME}<
9191
default user = >{LOCAL_USER}<
9292
default distro = >{LOCAL_DISTRO}<
9393
Included section from else
9494
Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated)
9595
Multiple lines
9696
Included section for arch = {LOCAL_ARCH} ({LOCAL_ARCH} repeated)
97-
Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated)
98-
Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again)
97+
Included section for os = {LOCAL_OS} ({LOCAL_OS} repeated)
98+
Included section for host = {LOCAL_HOSTNAME} ({LOCAL_HOSTNAME} again)
9999
Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated)
100100
Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again)
101101
end of template
@@ -149,12 +149,12 @@ def test_template_default(runner, yadm, tmpdir):
149149
script = f"""
150150
YADM_TEST=1 source {yadm}
151151
set_awk
152-
local_class="{LOCAL_CLASS}"
153-
local_arch="{LOCAL_ARCH}"
154-
local_system="{LOCAL_SYSTEM}"
155-
local_host="{LOCAL_HOST}"
156-
local_user="{LOCAL_USER}"
157-
local_distro="{LOCAL_DISTRO}"
152+
YADM_CLASS="{LOCAL_CLASS}"
153+
YADM_ARCH="{LOCAL_ARCH}"
154+
YADM_OS="{LOCAL_OS}"
155+
YADM_HOSTNAME="{LOCAL_HOSTNAME}"
156+
YADM_USER="{LOCAL_USER}"
157+
YADM_DISTRO="{LOCAL_DISTRO}"
158158
template_default "{input_file}" "{output_file}"
159159
"""
160160
run = runner(command=['bash'], inp=script)
@@ -193,7 +193,7 @@ def test_include(runner, yadm, tmpdir):
193193
basic_file = tmpdir.join('basic')
194194
basic_file.write(INCLUDE_BASIC)
195195

196-
variables_file = tmpdir.join(f'variables.{LOCAL_SYSTEM}')
196+
variables_file = tmpdir.join(f'variables.{LOCAL_OS}')
197197
variables_file.write(INCLUDE_VARIABLES)
198198

199199
nested_file = tmpdir.join('dir').join('nested')
@@ -207,8 +207,8 @@ def test_include(runner, yadm, tmpdir):
207207
script = f"""
208208
YADM_TEST=1 source {yadm}
209209
set_awk
210-
local_class="{LOCAL_CLASS}"
211-
local_system="{LOCAL_SYSTEM}"
210+
YADM_CLASS="{LOCAL_CLASS}"
211+
YADM_OS="{LOCAL_OS}"
212212
template_default "{input_file}" "{output_file}"
213213
"""
214214
run = runner(command=['bash'], inp=script)

‎test/test_unit_template_esh.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
LOCAL_CLASS = "esh_Test+@-!^Class"
77
LOCAL_ARCH = "esh_Test+@-!^Arch"
8-
LOCAL_SYSTEM = "esh_Test+@-!^System"
9-
LOCAL_HOST = "esh_Test+@-!^Host"
8+
LOCAL_OS = "esh_Test+@-!^System"
9+
LOCAL_HOSTNAME = "esh_Test+@-!^Host"
1010
LOCAL_USER = "esh_Test+@-!^User"
1111
LOCAL_DISTRO = "esh_Test+@-!^Distro"
1212
TEMPLATE = f'''
@@ -38,7 +38,7 @@
3838
<% if [ "$YADM_OS" = "wrongos1" ]; then -%>
3939
wrong os 1
4040
<% fi -%>
41-
<% if [ "$YADM_OS" = "{LOCAL_SYSTEM}" ]; then -%>
41+
<% if [ "$YADM_OS" = "{LOCAL_OS}" ]; then -%>
4242
Included section for os = <%=$YADM_OS%> (<%=$YADM_OS%> repeated)
4343
<% fi -%>
4444
<% if [ "$YADM_OS" = "wrongos2" ]; then -%>
@@ -47,7 +47,7 @@
4747
<% if [ "$YADM_HOSTNAME" = "wronghost1" ]; then -%>
4848
wrong host 1
4949
<% fi -%>
50-
<% if [ "$YADM_HOSTNAME" = "{LOCAL_HOST}" ]; then -%>
50+
<% if [ "$YADM_HOSTNAME" = "{LOCAL_HOSTNAME}" ]; then -%>
5151
Included section for host = <%=$YADM_HOSTNAME%> (<%=$YADM_HOSTNAME%> again)
5252
<% fi -%>
5353
<% if [ "$YADM_HOSTNAME" = "wronghost2" ]; then -%>
@@ -77,14 +77,14 @@
7777
start of template
7878
esh class = >{LOCAL_CLASS}<
7979
esh arch = >{LOCAL_ARCH}<
80-
esh os = >{LOCAL_SYSTEM}<
81-
esh host = >{LOCAL_HOST}<
80+
esh os = >{LOCAL_OS}<
81+
esh host = >{LOCAL_HOSTNAME}<
8282
esh user = >{LOCAL_USER}<
8383
esh distro = >{LOCAL_DISTRO}<
8484
Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated)
8585
Included section for arch = {LOCAL_ARCH} ({LOCAL_ARCH} repeated)
86-
Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated)
87-
Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again)
86+
Included section for os = {LOCAL_OS} ({LOCAL_OS} repeated)
87+
Included section for host = {LOCAL_HOSTNAME} ({LOCAL_HOSTNAME} again)
8888
Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated)
8989
Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again)
9090
end of template
@@ -107,12 +107,12 @@ def test_template_esh(runner, yadm, tmpdir):
107107

108108
script = f"""
109109
YADM_TEST=1 source {yadm}
110-
local_class="{LOCAL_CLASS}"
111-
local_arch="{LOCAL_ARCH}"
112-
local_system="{LOCAL_SYSTEM}"
113-
local_host="{LOCAL_HOST}"
114-
local_user="{LOCAL_USER}"
115-
local_distro="{LOCAL_DISTRO}"
110+
export YADM_CLASS="{LOCAL_CLASS}"
111+
export YADM_ARCH="{LOCAL_ARCH}"
112+
export YADM_OS="{LOCAL_OS}"
113+
export YADM_HOSTNAME="{LOCAL_HOSTNAME}"
114+
export YADM_USER="{LOCAL_USER}"
115+
export YADM_DISTRO="{LOCAL_DISTRO}"
116116
template_esh "{input_file}" "{output_file}"
117117
"""
118118
run = runner(command=['bash'], inp=script)

‎test/test_unit_template_j2.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
LOCAL_CLASS = "j2_Test+@-!^Class"
88
LOCAL_ARCH = "j2_Test+@-!^Arch"
9-
LOCAL_SYSTEM = "j2_Test+@-!^System"
10-
LOCAL_HOST = "j2_Test+@-!^Host"
9+
LOCAL_OS = "j2_Test+@-!^System"
10+
LOCAL_HOSTNAME = "j2_Test+@-!^Host"
1111
LOCAL_USER = "j2_Test+@-!^User"
1212
LOCAL_DISTRO = "j2_Test+@-!^Distro"
1313
TEMPLATE = f'''
@@ -39,7 +39,7 @@
3939
{{%- if YADM_OS == "wrongos1" %}}
4040
wrong os 1
4141
{{%- endif %}}
42-
{{%- if YADM_OS == "{LOCAL_SYSTEM}" %}}
42+
{{%- if YADM_OS == "{LOCAL_OS}" %}}
4343
Included section for os = {{{{YADM_OS}}}} ({{{{YADM_OS}}}} repeated)
4444
{{%- endif %}}
4545
{{%- if YADM_OS == "wrongos2" %}}
@@ -48,7 +48,7 @@
4848
{{%- if YADM_HOSTNAME == "wronghost1" %}}
4949
wrong host 1
5050
{{%- endif %}}
51-
{{%- if YADM_HOSTNAME == "{LOCAL_HOST}" %}}
51+
{{%- if YADM_HOSTNAME == "{LOCAL_HOSTNAME}" %}}
5252
Included section for host = {{{{YADM_HOSTNAME}}}} ({{{{YADM_HOSTNAME}}}} again)
5353
{{%- endif %}}
5454
{{%- if YADM_HOSTNAME == "wronghost2" %}}
@@ -78,14 +78,14 @@
7878
start of template
7979
j2 class = >{LOCAL_CLASS}<
8080
j2 arch = >{LOCAL_ARCH}<
81-
j2 os = >{LOCAL_SYSTEM}<
82-
j2 host = >{LOCAL_HOST}<
81+
j2 os = >{LOCAL_OS}<
82+
j2 host = >{LOCAL_HOSTNAME}<
8383
j2 user = >{LOCAL_USER}<
8484
j2 distro = >{LOCAL_DISTRO}<
8585
Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated)
8686
Included section for arch = {LOCAL_ARCH} ({LOCAL_ARCH} repeated)
87-
Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated)
88-
Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again)
87+
Included section for os = {LOCAL_OS} ({LOCAL_OS} repeated)
88+
Included section for host = {LOCAL_HOSTNAME} ({LOCAL_HOSTNAME} again)
8989
Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated)
9090
Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again)
9191
end of template
@@ -109,12 +109,12 @@ def test_template_j2(runner, yadm, tmpdir, processor):
109109

110110
script = f"""
111111
YADM_TEST=1 source {yadm}
112-
local_class="{LOCAL_CLASS}"
113-
local_arch="{LOCAL_ARCH}"
114-
local_system="{LOCAL_SYSTEM}"
115-
local_host="{LOCAL_HOST}"
116-
local_user="{LOCAL_USER}"
117-
local_distro="{LOCAL_DISTRO}"
112+
export YADM_CLASS="{LOCAL_CLASS}"
113+
export YADM_ARCH="{LOCAL_ARCH}"
114+
export YADM_OS="{LOCAL_OS}"
115+
export YADM_HOSTNAME="{LOCAL_HOSTNAME}"
116+
export YADM_USER="{LOCAL_USER}"
117+
export YADM_DISTRO="{LOCAL_DISTRO}"
118118
template_{processor} "{input_file}" "{output_file}"
119119
"""
120120
run = runner(command=['bash'], inp=script)

0 commit comments

Comments
 (0)