Skip to content

Commit c834977

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 a5b1067 commit c834977

File tree

6 files changed

+108
-122
lines changed

6 files changed

+108
-122
lines changed

‎test/test_unit_score_file.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'labels': ['default'],
77
'modifier': 0,
88
},
9-
'system': {
9+
'os': {
1010
'labels': ['o', 'os'],
1111
'modifier': 1,
1212
},
@@ -44,9 +44,9 @@ def calculate_score(filename):
4444
label, value = condition.split('.', 1)
4545
if label in CONDITION['default']['labels']:
4646
score += 1000
47-
elif label in CONDITION['system']['labels']:
48-
if value == 'testsystem':
49-
score += 1000 + CONDITION['system']['modifier']
47+
elif label in CONDITION['os']['labels']:
48+
if value == 'testos':
49+
score += 1000 + CONDITION['os']['modifier']
5050
else:
5151
score = 0
5252
break
@@ -83,7 +83,7 @@ def calculate_score(filename):
8383
@pytest.mark.parametrize(
8484
'default', ['default', None], ids=['default', 'no-default'])
8585
@pytest.mark.parametrize(
86-
'system', ['system', None], ids=['system', 'no-system'])
86+
'system', ['os', None], ids=['os', 'no-os'])
8787
@pytest.mark.parametrize(
8888
'distro', ['distro', None], ids=['distro', 'no-distro'])
8989
@pytest.mark.parametrize(
@@ -97,9 +97,9 @@ def test_score_values(
9797
"""Test score results"""
9898
# pylint: disable=too-many-branches
9999
local_class = 'testclass'
100-
local_system = 'testsystem'
100+
local_os = 'testos'
101101
local_distro = 'testdistro'
102-
local_host = 'testhost'
102+
local_hostname = 'testhost'
103103
local_user = 'testuser'
104104
filenames = {'filename##': 0}
105105

@@ -120,7 +120,7 @@ def test_score_values(
120120
newfile += ','
121121
newfile += '.'.join([
122122
label,
123-
local_system if match else 'badsys'
123+
local_os if match else 'bados'
124124
])
125125
filenames[newfile] = calculate_score(newfile)
126126
if distro:
@@ -156,7 +156,7 @@ def test_score_values(
156156
newfile += ','
157157
newfile += '.'.join([
158158
label,
159-
local_host if match else 'badhost'
159+
local_hostname if match else 'badhost'
160160
])
161161
filenames[newfile] = calculate_score(newfile)
162162
if user:
@@ -175,11 +175,11 @@ def test_score_values(
175175
script = f"""
176176
YADM_TEST=1 source {yadm}
177177
score=0
178-
local_class={local_class}
179-
local_system={local_system}
180-
local_distro={local_distro}
181-
local_host={local_host}
182-
local_user={local_user}
178+
YADM_CLASS={local_class}
179+
YADM_OS={local_os}
180+
YADM_DISTRO={local_distro}
181+
YADM_HOSTNAME={local_hostname}
182+
YADM_USER={local_user}
183183
"""
184184
expected = ''
185185
for filename in filenames:
@@ -207,7 +207,7 @@ def test_extensions(runner, yadm, ext):
207207
script = f"""
208208
YADM_TEST=1 source {yadm}
209209
score=0
210-
local_user={local_user}
210+
YADM_USER={local_user}
211211
score_file "{filename}"
212212
echo "$score"
213213
"""
@@ -221,9 +221,9 @@ def test_extensions(runner, yadm, ext):
221221
def test_score_values_templates(runner, yadm):
222222
"""Test score results"""
223223
local_class = 'testclass'
224-
local_system = 'testsystem'
224+
local_os = 'testos'
225225
local_distro = 'testdistro'
226-
local_host = 'testhost'
226+
local_hostname = 'testhost'
227227
local_user = 'testuser'
228228
filenames = {'filename##': 0}
229229

@@ -238,11 +238,11 @@ def test_score_values_templates(runner, yadm):
238238
script = f"""
239239
YADM_TEST=1 source {yadm}
240240
score=0
241-
local_class={local_class}
242-
local_system={local_system}
243-
local_distro={local_distro}
244-
local_host={local_host}
245-
local_user={local_user}
241+
YADM_CLASS={local_class}
242+
YADM_OS={local_os}
243+
YADM_DISTRO={local_distro}
244+
YADM_HOSTNAME={local_hostname}
245+
YADM_USER={local_user}
246246
"""
247247
expected = ''
248248
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: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
# these values are also testing the handling of bizarre characters
77
LOCAL_CLASS = "default_Test+@-!^Class"
8-
LOCAL_SYSTEM = "default_Test+@-!^System"
9-
LOCAL_HOST = "default_Test+@-!^Host"
8+
LOCAL_OS = "default_Test+@-!^System"
9+
LOCAL_HOSTNAME = "default_Test+@-!^Host"
1010
LOCAL_USER = "default_Test+@-!^User"
1111
LOCAL_DISTRO = "default_Test+@-!^Distro"
1212
TEMPLATE = f'''
@@ -36,7 +36,7 @@
3636
{{% if yadm.os == "wrongos1" %}}
3737
wrong os 1
3838
{{% endif %}}
39-
{{% if yadm.os == "{LOCAL_SYSTEM}" %}}
39+
{{% if yadm.os == "{LOCAL_OS}" %}}
4040
Included section for os = {{{{yadm.os}}}} ({{{{yadm.os}}}} repeated)
4141
{{% endif %}}
4242
{{% if yadm.os == "wrongos2" %}}
@@ -45,7 +45,7 @@
4545
{{% if yadm.hostname == "wronghost1" %}}
4646
wrong host 1
4747
{{% endif %}}
48-
{{% if yadm.hostname == "{LOCAL_HOST}" %}}
48+
{{% if yadm.hostname == "{LOCAL_HOSTNAME}" %}}
4949
Included section for host = {{{{yadm.hostname}}}} ({{{{yadm.hostname}}}} again)
5050
{{% endif %}}
5151
{{% if yadm.hostname == "wronghost2" %}}
@@ -74,15 +74,15 @@
7474
EXPECTED = f'''
7575
start of template
7676
default class = >{LOCAL_CLASS}<
77-
default os = >{LOCAL_SYSTEM}<
78-
default host = >{LOCAL_HOST}<
77+
default os = >{LOCAL_OS}<
78+
default host = >{LOCAL_HOSTNAME}<
7979
default user = >{LOCAL_USER}<
8080
default distro = >{LOCAL_DISTRO}<
8181
Included section from else
8282
Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated)
8383
Multiple lines
84-
Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated)
85-
Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again)
84+
Included section for os = {LOCAL_OS} ({LOCAL_OS} repeated)
85+
Included section for host = {LOCAL_HOSTNAME} ({LOCAL_HOSTNAME} again)
8686
Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated)
8787
Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again)
8888
end of template
@@ -130,11 +130,11 @@ def test_template_default(runner, yadm, tmpdir):
130130
script = f"""
131131
YADM_TEST=1 source {yadm}
132132
set_awk
133-
local_class="{LOCAL_CLASS}"
134-
local_system="{LOCAL_SYSTEM}"
135-
local_host="{LOCAL_HOST}"
136-
local_user="{LOCAL_USER}"
137-
local_distro="{LOCAL_DISTRO}"
133+
YADM_CLASS="{LOCAL_CLASS}"
134+
YADM_OS="{LOCAL_OS}"
135+
YADM_HOSTNAME="{LOCAL_HOSTNAME}"
136+
YADM_USER="{LOCAL_USER}"
137+
YADM_DISTRO="{LOCAL_DISTRO}"
138138
template_default "{input_file}" "{output_file}"
139139
"""
140140
run = runner(command=['bash'], inp=script)
@@ -173,7 +173,7 @@ def test_include(runner, yadm, tmpdir):
173173
basic_file = tmpdir.join('basic')
174174
basic_file.write(INCLUDE_BASIC)
175175

176-
variables_file = tmpdir.join(f'variables.{LOCAL_SYSTEM}')
176+
variables_file = tmpdir.join(f'variables.{LOCAL_OS}')
177177
variables_file.write(INCLUDE_VARIABLES)
178178

179179
nested_file = tmpdir.join('dir').join('nested')
@@ -187,8 +187,8 @@ def test_include(runner, yadm, tmpdir):
187187
script = f"""
188188
YADM_TEST=1 source {yadm}
189189
set_awk
190-
local_class="{LOCAL_CLASS}"
191-
local_system="{LOCAL_SYSTEM}"
190+
YADM_CLASS="{LOCAL_CLASS}"
191+
YADM_OS="{LOCAL_OS}"
192192
template_default "{input_file}" "{output_file}"
193193
"""
194194
run = runner(command=['bash'], inp=script)

‎test/test_unit_template_esh.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
FILE_MODE = 0o754
55

66
LOCAL_CLASS = "esh_Test+@-!^Class"
7-
LOCAL_SYSTEM = "esh_Test+@-!^System"
8-
LOCAL_HOST = "esh_Test+@-!^Host"
7+
LOCAL_OS = "esh_Test+@-!^System"
8+
LOCAL_HOSTNAME = "esh_Test+@-!^Host"
99
LOCAL_USER = "esh_Test+@-!^User"
1010
LOCAL_DISTRO = "esh_Test+@-!^Distro"
1111
TEMPLATE = f'''
@@ -27,7 +27,7 @@
2727
<% if [ "$YADM_OS" = "wrongos1" ]; then -%>
2828
wrong os 1
2929
<% fi -%>
30-
<% if [ "$YADM_OS" = "{LOCAL_SYSTEM}" ]; then -%>
30+
<% if [ "$YADM_OS" = "{LOCAL_OS}" ]; then -%>
3131
Included section for os = <%=$YADM_OS%> (<%=$YADM_OS%> repeated)
3232
<% fi -%>
3333
<% if [ "$YADM_OS" = "wrongos2" ]; then -%>
@@ -36,7 +36,7 @@
3636
<% if [ "$YADM_HOSTNAME" = "wronghost1" ]; then -%>
3737
wrong host 1
3838
<% fi -%>
39-
<% if [ "$YADM_HOSTNAME" = "{LOCAL_HOST}" ]; then -%>
39+
<% if [ "$YADM_HOSTNAME" = "{LOCAL_HOSTNAME}" ]; then -%>
4040
Included section for host = <%=$YADM_HOSTNAME%> (<%=$YADM_HOSTNAME%> again)
4141
<% fi -%>
4242
<% if [ "$YADM_HOSTNAME" = "wronghost2" ]; then -%>
@@ -65,13 +65,13 @@
6565
EXPECTED = f'''
6666
start of template
6767
esh class = >{LOCAL_CLASS}<
68-
esh os = >{LOCAL_SYSTEM}<
69-
esh host = >{LOCAL_HOST}<
68+
esh os = >{LOCAL_OS}<
69+
esh host = >{LOCAL_HOSTNAME}<
7070
esh user = >{LOCAL_USER}<
7171
esh distro = >{LOCAL_DISTRO}<
7272
Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated)
73-
Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated)
74-
Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again)
73+
Included section for os = {LOCAL_OS} ({LOCAL_OS} repeated)
74+
Included section for host = {LOCAL_HOSTNAME} ({LOCAL_HOSTNAME} again)
7575
Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated)
7676
Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again)
7777
end of template
@@ -88,11 +88,11 @@ def test_template_esh(runner, yadm, tmpdir):
8888

8989
script = f"""
9090
YADM_TEST=1 source {yadm}
91-
local_class="{LOCAL_CLASS}"
92-
local_system="{LOCAL_SYSTEM}"
93-
local_host="{LOCAL_HOST}"
94-
local_user="{LOCAL_USER}"
95-
local_distro="{LOCAL_DISTRO}"
91+
export YADM_CLASS="{LOCAL_CLASS}"
92+
export YADM_OS="{LOCAL_OS}"
93+
export YADM_HOSTNAME="{LOCAL_HOSTNAME}"
94+
export YADM_USER="{LOCAL_USER}"
95+
export YADM_DISTRO="{LOCAL_DISTRO}"
9696
template_esh "{input_file}" "{output_file}"
9797
"""
9898
run = runner(command=['bash'], inp=script)

‎test/test_unit_template_j2.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
FILE_MODE = 0o754
66

77
LOCAL_CLASS = "j2_Test+@-!^Class"
8-
LOCAL_SYSTEM = "j2_Test+@-!^System"
9-
LOCAL_HOST = "j2_Test+@-!^Host"
8+
LOCAL_OS = "j2_Test+@-!^System"
9+
LOCAL_HOSTNAME = "j2_Test+@-!^Host"
1010
LOCAL_USER = "j2_Test+@-!^User"
1111
LOCAL_DISTRO = "j2_Test+@-!^Distro"
1212
TEMPLATE = f'''
@@ -28,7 +28,7 @@
2828
{{%- if YADM_OS == "wrongos1" %}}
2929
wrong os 1
3030
{{%- endif %}}
31-
{{%- if YADM_OS == "{LOCAL_SYSTEM}" %}}
31+
{{%- if YADM_OS == "{LOCAL_OS}" %}}
3232
Included section for os = {{{{YADM_OS}}}} ({{{{YADM_OS}}}} repeated)
3333
{{%- endif %}}
3434
{{%- if YADM_OS == "wrongos2" %}}
@@ -37,7 +37,7 @@
3737
{{%- if YADM_HOSTNAME == "wronghost1" %}}
3838
wrong host 1
3939
{{%- endif %}}
40-
{{%- if YADM_HOSTNAME == "{LOCAL_HOST}" %}}
40+
{{%- if YADM_HOSTNAME == "{LOCAL_HOSTNAME}" %}}
4141
Included section for host = {{{{YADM_HOSTNAME}}}} ({{{{YADM_HOSTNAME}}}} again)
4242
{{%- endif %}}
4343
{{%- if YADM_HOSTNAME == "wronghost2" %}}
@@ -66,13 +66,13 @@
6666
EXPECTED = f'''
6767
start of template
6868
j2 class = >{LOCAL_CLASS}<
69-
j2 os = >{LOCAL_SYSTEM}<
70-
j2 host = >{LOCAL_HOST}<
69+
j2 os = >{LOCAL_OS}<
70+
j2 host = >{LOCAL_HOSTNAME}<
7171
j2 user = >{LOCAL_USER}<
7272
j2 distro = >{LOCAL_DISTRO}<
7373
Included section for class = {LOCAL_CLASS} ({LOCAL_CLASS} repeated)
74-
Included section for os = {LOCAL_SYSTEM} ({LOCAL_SYSTEM} repeated)
75-
Included section for host = {LOCAL_HOST} ({LOCAL_HOST} again)
74+
Included section for os = {LOCAL_OS} ({LOCAL_OS} repeated)
75+
Included section for host = {LOCAL_HOSTNAME} ({LOCAL_HOSTNAME} again)
7676
Included section for user = {LOCAL_USER} ({LOCAL_USER} repeated)
7777
Included section for distro = {LOCAL_DISTRO} ({LOCAL_DISTRO} again)
7878
end of template
@@ -90,11 +90,11 @@ def test_template_j2(runner, yadm, tmpdir, processor):
9090

9191
script = f"""
9292
YADM_TEST=1 source {yadm}
93-
local_class="{LOCAL_CLASS}"
94-
local_system="{LOCAL_SYSTEM}"
95-
local_host="{LOCAL_HOST}"
96-
local_user="{LOCAL_USER}"
97-
local_distro="{LOCAL_DISTRO}"
93+
export YADM_CLASS="{LOCAL_CLASS}"
94+
export YADM_OS="{LOCAL_OS}"
95+
export YADM_HOSTNAME="{LOCAL_HOSTNAME}"
96+
export YADM_USER="{LOCAL_USER}"
97+
export YADM_DISTRO="{LOCAL_DISTRO}"
9898
template_{processor} "{input_file}" "{output_file}"
9999
"""
100100
run = runner(command=['bash'], inp=script)

0 commit comments

Comments
 (0)